Index: src/builder.cpp
===================================================================
--- src/builder.cpp	(revision d7e30ca04fa0adf2762a650a9f855a8ded1885f5)
+++ src/builder.cpp	(revision 5e0d1f1c85a9ade010b400eb5a691b8c94a48949)
@@ -63,6 +63,6 @@
 {
   atom *first, *second, *third, *fourth;
-  vector **atoms;
-  vector x,y,z,n;  // coordinates for absolute point in cell volume
+  Vector **atoms;
+  Vector x,y,z,n;  // coordinates for absolute point in cell volume
   double a,b,c;
   char choice;  // menu choice char
@@ -99,7 +99,7 @@
           cout << Verbose(0) << "Enter relative coordinates." << endl;
           first->x.AskPosition(mol->cell_size, false);
-          first->x.AddVector((const vector *)&x);
+          first->x.AddVector((const Vector *)&x);
           cout << Verbose(0) << "\n";
-        } while (!(valid = mol->CheckBounds((const vector *)&first->x)));
+        } while (!(valid = mol->CheckBounds((const Vector *)&first->x)));
         first->type = periode->AskElement();  // give type
         mol->AddAtom(first);  // add to molecule
@@ -117,5 +117,5 @@
             first->x.x[i] += second->x.x[i];
           }
-        } while (!(valid = mol->CheckBounds((const vector *)&first->x)));
+        } while (!(valid = mol->CheckBounds((const Vector *)&first->x)));
         first->type = periode->AskElement();  // give type
         mol->AddAtom(first);  // add to molecule
@@ -219,5 +219,5 @@
           first->x.Output((ofstream *)&cout);
           cout << Verbose(0) << endl;
-        } while (!(valid = mol->CheckBounds((const vector *)&first->x)));
+        } while (!(valid = mol->CheckBounds((const Vector *)&first->x)));
         first->type = periode->AskElement();  // give type
         mol->AddAtom(first);  // add to molecule
@@ -226,5 +226,5 @@
       case 'e': // least square distance position to a set of atoms
         first = new atom;
-        atoms = new (vector*[128]);
+        atoms = new (Vector*[128]);
         valid = true;
         for(int i=128;i--;)
@@ -259,5 +259,5 @@
 static void CenterAtoms(molecule *mol)
 {
-  vector x, y;
+  Vector x, y;
   char choice;  // menu choice char
   
@@ -315,5 +315,5 @@
 {
   atom *first, *second, *third;
-  vector x,n;
+  Vector x,n;
   char choice;  // menu choice char
 
@@ -335,5 +335,5 @@
       third = mol->AskAtom("Enter third atom: ");
 
-      n.MakeNormalVector((const vector *)&first->x,(const vector *)&second->x,(const vector *)&third->x);
+      n.MakeNormalVector((const Vector *)&first->x,(const Vector *)&second->x,(const Vector *)&third->x);
       break;
     case 'b': // normal vector of mirror plane
@@ -346,11 +346,11 @@
       second = mol->AskAtom("Enter second atom: ");
 
-      n.CopyVector((const vector *)&first->x);  
-      n.SubtractVector((const vector *)&second->x);  
+      n.CopyVector((const Vector *)&first->x);  
+      n.SubtractVector((const Vector *)&second->x);  
       n.Normalize();
       break;        
     case 'd':
       char shorthand[4];
-      vector a;
+      Vector a;
       struct lsq_params param;
       do {
@@ -383,5 +383,5 @@
 {
   atom *first, *second, *third;
-  vector n;
+  Vector n;
   char choice;  // menu choice char
   
@@ -402,5 +402,5 @@
       third = mol->AskAtom("Enter third atom: ");
 
-      n.MakeNormalVector((const vector *)&first->x,(const vector *)&second->x,(const vector *)&third->x);
+      n.MakeNormalVector((const Vector *)&first->x,(const Vector *)&second->x,(const Vector *)&third->x);
       break;
     case 'b': // normal vector of mirror plane
@@ -413,6 +413,6 @@
       second = mol->AskAtom("Enter second atom: ");
 
-      n.CopyVector((const vector *)&first->x);  
-      n.SubtractVector((const vector *)&second->x);  
+      n.CopyVector((const Vector *)&first->x);  
+      n.SubtractVector((const Vector *)&second->x);  
       n.Normalize();
       break;          
@@ -421,5 +421,5 @@
   n.Output((ofstream *)&cout);
   cout << Verbose(0) << endl;
-  mol->Mirror((const vector *)&n);
+  mol->Mirror((const Vector *)&n);
 };
 
@@ -458,5 +458,5 @@
       while(first->next != mol->end) {
         first = first->next;
-        if (first->x.Distance((const vector *)&second->x) > tmp1*tmp1) // distance to first above radius ...
+        if (first->x.Distance((const Vector *)&second->x) > tmp1*tmp1) // distance to first above radius ...
           mol->RemoveAtom(first);
       }
@@ -488,5 +488,5 @@
 {
   atom *first, *second, *third;
-  vector x,y;
+  Vector x,y;
   double min[256], tmp1, tmp2, tmp3;
   int Z;
@@ -519,6 +519,6 @@
         tmp1 = 0.;
         if (first != second) {
-          x.CopyVector((const vector *)&first->x);
-          x.SubtractVector((const vector *)&second->x);
+          x.CopyVector((const Vector *)&first->x);
+          x.SubtractVector((const Vector *)&second->x);
           tmp1 = x.Norm();
         }
@@ -535,6 +535,6 @@
       for (int i=NDIM;i--;)
         min[i] = 0.;
-      x.CopyVector((const vector *)&first->x);
-      x.SubtractVector((const vector *)&second->x);
+      x.CopyVector((const Vector *)&first->x);
+      x.SubtractVector((const Vector *)&second->x);
       tmp1 = x.Norm();
       cout << Verbose(1) << "Distance vector is ";
@@ -549,10 +549,10 @@
       third  = mol->AskAtom("Enter last atom: ");
       tmp1 = tmp2 = tmp3 = 0.;
-      x.CopyVector((const vector *)&first->x);
-      x.SubtractVector((const vector *)&second->x);
-      y.CopyVector((const vector *)&third->x);
-      y.SubtractVector((const vector *)&second->x);
+      x.CopyVector((const Vector *)&first->x);
+      x.SubtractVector((const Vector *)&second->x);
+      y.CopyVector((const Vector *)&third->x);
+      y.SubtractVector((const Vector *)&second->x);
       cout << Verbose(0) << "Bond angle between first atom Nr." << first->nr << ", central atom Nr." << second->nr << " and last atom Nr." << third->nr << ": ";
-      cout << Verbose(0) << (acos(x.ScalarProduct((const vector *)&y)/(y.Norm()*x.Norm()))/M_PI*180.) << " degrees" << endl;         
+      cout << Verbose(0) << (acos(x.ScalarProduct((const Vector *)&y)/(y.Norm()*x.Norm()))/M_PI*180.) << " degrees" << endl;         
       break;
     case 'd':
@@ -727,5 +727,5 @@
 static int ParseCommandLineOptions(int argc, char **argv, molecule *&mol, periodentafel *&periode, config& configuration, char *&ConfigFileName, char *&PathToDatabases)
 {
-  vector x,y,z,n;  // coordinates for absolute point in cell volume
+  Vector x,y,z,n;  // coordinates for absolute point in cell volume
   double *factor; // unit factor if desired
   ifstream test;
@@ -889,5 +889,5 @@
               for (int i=NDIM;i--;)
                 x.x[i] = atof(argv[argptr+i]);
-              mol->Translate((const vector *)&x);
+              mol->Translate((const Vector *)&x);
               argptr+=3;
               break;
@@ -958,5 +958,5 @@
                 mol->cell_size[j] += x.x[i]*2.;
               }
-              mol->Translate((const vector *)&x);
+              mol->Translate((const Vector *)&x);
               break;
             case 'O':
@@ -1034,5 +1034,5 @@
                 int count;
                 element ** Elements;
-                vector ** vectors;
+                Vector ** vectors;
                 if (faktor < 1) {
                   cerr << Verbose(0) << "ERROR: Repetition faktor mus be greater than 1!" << endl;
@@ -1043,5 +1043,5 @@
                   count = mol->AtomCount;   // is changed becausing of adding, thus has to be stored away beforehand
                   Elements = new element *[count];
-                  vectors = new vector *[count];
+                  vectors = new Vector *[count];
                   j = 0;
                   first = mol->start;
@@ -1117,5 +1117,5 @@
   atom *first, *second;
   char choice;  // menu choice char
-  vector x,y,z,n;  // coordinates for absolute point in cell volume
+  Vector x,y,z,n;  // coordinates for absolute point in cell volume
 	double *factor;	// unit factor if desired
   bool valid; // flag if input was valid or not
@@ -1132,5 +1132,5 @@
   clock_t start,end;
   element **Elements;
-  vector **vectors;
+  Vector **vectors;
 
   // =========================== PARSE COMMAND LINE OPTIONS ====================================
@@ -1231,5 +1231,5 @@
           count = mol->AtomCount;   // is changed becausing of adding, thus has to be stored away beforehand
           Elements = new element *[count];
-          vectors = new vector *[count];
+          vectors = new Vector *[count];
           j = 0;
           first = mol->start;
@@ -1335,5 +1335,5 @@
        cout << Verbose(0) << "Enter translation vector." << endl;       
        x.AskPosition(mol->cell_size,0);
-       mol->Translate((const vector *)&x);
+       mol->Translate((const Vector *)&x);
        break;
   
