Changes in src/UIElements/TextDialog.hpp [97ebf8:5605032]

File:

• src/UIElements/TextDialog.hpp (modified) (7 diffs)

src/UIElements/TextDialog.hpp

@@ -13 +13 @@
 #include "UIElements/Dialog.hpp"
 
-class atom;
-class element;
-class molecule;
-class Vector;
-
 class TextDialog : public Dialog
 {
@@ -24 +19 @@
   virtual ~TextDialog();
 
-  virtual void queryEmpty(const char *, std::string = "");
-  virtual void queryBoolean(const char *, bool *, std::string = "");
-  virtual void queryInt(const char *, int *, std::string = "");
-  virtual void queryString(const char*, std::string *, std::string = "");
-  virtual void queryDouble(const char*, double*, std::string = "");
-  virtual void queryAtom(const char*,atom**,std::string = "");
-  virtual void queryMolecule(const char*,molecule**,std::string = "");
-  virtual void queryVector(const char*,Vector *,const double * const,bool, std::string = "");
-  virtual void queryBox(const char*,double ** const, std::string = "");
-  virtual void queryElement(const char*,const element **, std::string = "");
+  virtual void queryInt(const char *, int *);
+  virtual void queryString(const char*, std::string *);
+  virtual void queryDouble(const char*, double*);
+  virtual void queryMolecule(const char*,molecule**,MoleculeListClass*);
+  virtual void queryVector(const char*,Vector *,const double * const,bool);
+  virtual void queryElement(const char*,const element **);
 
 protected:
   // specialized stuff for text queries
-  class EmptyTextQuery : public Dialog::EmptyQuery {
-  public:
-    EmptyTextQuery(std::string title, std::string _description = NULL);
-    virtual ~EmptyTextQuery();
-    virtual bool handle();
-  };
-
-  class BooleanTextQuery : public Dialog::BooleanQuery {
-  public:
-    BooleanTextQuery(std::string title, bool *_target, std::string _description = NULL);
-    virtual ~BooleanTextQuery();
-    virtual bool handle();
-  };
-
   class IntTextQuery : public Dialog::IntQuery {
   public:
-    IntTextQuery(std::string title, int *_target, std::string _description = NULL);
+    IntTextQuery(std::string title, int *_target);
     virtual ~IntTextQuery();
     virtual bool handle();
@@ -60 +37 @@
   class DoubleTextQuery : public Dialog::DoubleQuery {
   public:
-    DoubleTextQuery(std::string title, double *_target, std::string _description = NULL);
+    DoubleTextQuery(std::string title, double *_target);
     virtual ~DoubleTextQuery();
     virtual bool handle();
@@ -67 +44 @@
   class StringTextQuery : public Dialog::StringQuery {
   public:
-    StringTextQuery(std::string title, std::string *_target, std::string _description = NULL);
+    StringTextQuery(std::string title, std::string *_target);
     virtual ~StringTextQuery();
-    virtual bool handle();
-  };
-
-  class AtomTextQuery : public Dialog::AtomQuery {
-  public:
-    AtomTextQuery(std::string title, atom **_target, std::string _description = NULL);
-    virtual ~AtomTextQuery();
     virtual bool handle();
   };
@@ -81 +51 @@
   class MoleculeTextQuery : public Dialog::MoleculeQuery {
   public:
-    MoleculeTextQuery(std::string title, molecule **_target, std::string _description = NULL);
+    MoleculeTextQuery(std::string title, molecule **_target, MoleculeListClass *_molecules);
     virtual ~MoleculeTextQuery();
     virtual bool handle();
@@ -88 +58 @@
   class VectorTextQuery : public Dialog::VectorQuery {
   public:
-    VectorTextQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check, std::string _description = NULL);
+    VectorTextQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check);
     virtual ~VectorTextQuery();
-    virtual bool handle();
-  };
-
-  class BoxTextQuery : public Dialog::BoxQuery {
-  public:
-    BoxTextQuery(std::string title,double ** const _cellSize, std::string _description = NULL);
-    virtual ~BoxTextQuery();
     virtual bool handle();
   };
@@ -102 +65 @@
   class ElementTextQuery : public Dialog::ElementQuery {
   public:
-    ElementTextQuery(std::string title, const element **_target, std::string _description = NULL);
+    ElementTextQuery(std::string title, const element **_target);
     virtual ~ElementTextQuery();
     virtual bool handle();