Changeset b787af for molecuilder/src

Timestamp:

Mar 25, 2010, 1:01:35 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

cbc639

Parents:

eb129c

Message:

Repaired code that was broken by merge

Location:

molecuilder/src/UIElements

Files:

• Dialog.cpp (modified) (1 diff)
• Dialog.hpp (modified) (2 diffs)
• TextDialog.cpp (modified) (3 diffs)
• TextDialog.hpp (modified) (2 diffs)

molecuilder/src/UIElements/Dialog.cpp

@@ -135 +135 @@
 
 // Element Queries
-Dialog::ElementQuery::ElementQuery(std::string title, element **_target) :
+Dialog::ElementQuery::ElementQuery(std::string title, const element **_target) :
   Query(title),
-  target(_target),
-  tmp(0)
+  tmp(0),
+  target(_target)
   {}
 

molecuilder/src/UIElements/Dialog.hpp

@@ -28 +28 @@
   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*)=0;
   virtual void queryVector(const char*,Vector *,const double *const,bool)=0;
-  virtual void queryElement(const char*,element **)=0;
+  virtual void queryElement(const char*,const element **)=0;
 
   virtual bool display();
@@ -123 +123 @@
   class ElementQuery : public Query {
   public:
-    ElementQuery(std::string title, element**_target);
+    ElementQuery(std::string title, const element**_target);
     virtual ~ElementQuery();
     virtual bool handle()=0;
     virtual void setResult();
   protected:
-    element *tmp;
+    const element *tmp;
   private:
-    element **target;
+    const element **target;
   };
 

molecuilder/src/UIElements/TextDialog.cpp

@@ -49 +49 @@
 }
 
-void TextDialog::queryElement(const char* title, element **target){
+void TextDialog::queryElement(const char* title, const element **target){
   registerQuery(new ElementTextQuery(title,target));
 }
@@ -125 +125 @@
 
 
-TextDialog::ElementTextQuery::ElementTextQuery(std::string title, element **target) :
+TextDialog::ElementTextQuery::ElementTextQuery(std::string title, const element **target) :
     Dialog::ElementQuery(title,target)
 {}
@@ -136 +136 @@
   Log() << Verbose(0) << getTitle();
   cin >> Z;
-  tmp = World::get()->getPeriode()->FindElement(Z);
+  tmp = World::getInstance().getPeriode()->FindElement(Z);
   return tmp;
 }

molecuilder/src/UIElements/TextDialog.hpp

@@ -24 +24 @@
   virtual void queryMolecule(const char*,molecule**,MoleculeListClass*);
   virtual void queryVector(const char*,Vector *,const double * const,bool);
-  virtual void queryElement(const char*,element **);
+  virtual void queryElement(const char*,const element **);
 
 protected:
@@ -65 +65 @@
   class ElementTextQuery : public Dialog::ElementQuery {
   public:
-    ElementTextQuery(std::string title, element **_target);
+    ElementTextQuery(std::string title, const element **_target);
     virtual ~ElementTextQuery();
     virtual bool handle();