Changeset d50264 for molecuilder/src/UIElements/Dialog.cpp

Timestamp:

Feb 26, 2010, 2:01:57 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

db6b872

Parents:

f467c6 (diff), dc5413 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into MenuRefactoring

Conflicts:

molecuilder/src/UIElements/TextDialog.cpp

File:

• molecuilder/src/UIElements/Dialog.cpp (modified) (2 diffs)

molecuilder/src/UIElements/Dialog.cpp

@@ -102 +102 @@
 Dialog::MoleculeQuery::MoleculeQuery(string title, molecule **_target, MoleculeListClass *_molecules) :
     Query(title),
-    target(_target),
+    tmp(0),
     molecules(_molecules),
-    tmp(0)
+    target(_target)
+
 {}
 
@@ -116 +117 @@
 
 Dialog::VectorQuery::VectorQuery(std::string title,Vector *_target,const double *const _cellSize,bool _check) :
-  Query(title), target(_target), cellSize(_cellSize), check(_check)
+  Query(title),
+  cellSize(_cellSize),
+  check(_check),
+  target(_target)
 {
 tmp = new Vector();