Changes in src/periodentafel.hpp [ead4e6:fb73b8]

File:

• src/periodentafel.hpp (modified) (4 diffs)

src/periodentafel.hpp

@@ -1 +1 @@
 #ifndef PERIODENTAFEL_HPP_
 #define PERIODENTAFEL_HPP_
+
+using namespace std;
 
 /*********************************************** includes ***********************************/
@@ -10 +12 @@
 
 #include <iostream>
-#include <map>
-#include <iterator>
 
 #include "defs.hpp"
-#include "types.hpp"
 
 /****************************************** forward declarations *****************************/
@@ -26 +25 @@
  */
 class periodentafel {
-  /******* Types *********/
-  private:
-    typedef std::map<atomicNumber_t,element*> elementSet;
   public:
-    typedef elementSet::iterator iterator;
-    typedef elementSet::const_iterator const_iterator;
-    typedef std::reverse_iterator<const_iterator> reverse_iterator;
-  public:
-
+    element *start; //!< start of element list
+    element *end;   //!< end of element list
     char header1[MAXSTRINGSIZE]; //!< store first header line
     char header2[MAXSTRINGSIZE]; //!< store second header line
@@ -41 +34 @@
   ~periodentafel();
 
-  iterator AddElement(element * const pointer);
-  void RemoveElement(element * const pointer);
-  void CleanupPeriodtable();
-  const element *FindElement(atomicNumber_t) const;
-  const element *FindElement(const char * const shorthand) const;
-  const element *AskElement() const;
-  const element *EnterElement();
-
-  const_iterator begin();
-  const_iterator end();
-  reverse_iterator rbegin();
-  reverse_iterator rend();
-  bool Output(std::ostream * const output) const;
-  bool Checkout(std::ostream * const output, const int * const checkliste) const;
+  bool AddElement(element * const pointer);
+  bool RemoveElement(element * const pointer);
+  bool CleanupPeriodtable();
+  element * const FindElement(const int Z) const;
+  element * const FindElement(const char * const shorthand) const;
+  element * const AskElement() const;
+  element * const EnterElement();
+  bool Output(ofstream * const output) const;
+  bool Checkout(ofstream * const output, const int * const checkliste) const;
   bool LoadPeriodentafel(const char * const path);
   bool StorePeriodentafel(const char * const path) const;
 
   private:
-    elementSet elements;
 };