rename remaning german classes

AbstractElement.cpp

@@ -1,4 +1,4 @@
-#include "AbstractElement.h"
+#include "AbstractElement.h"
 
 using namespace Framework;
 
@@ -12,12 +12,12 @@ ElementPath::~ElementPath() {}
 
 bool Framework::ElementPath::isValid() const
 {
-    return index < path->getEintragAnzahl();
+    return index < path->getEntryCount();
 }
 
 bool Framework::ElementPath::hasNext() const
 {
-    return index < path->getEintragAnzahl() - 1;
+    return index < path->getEntryCount() - 1;
 }
 
 void Framework::ElementPath::next()

AlphaField.cpp

@@ -8,30 +8,30 @@
 
 using namespace Framework;
 
-// Content of the AlphaFeld class from AlphaField.h
+// Content of the AlphaField class from AlphaField.h
 // Constructor
-AlphaFeld::AlphaFeld()
+AlphaField::AlphaField()
     : Drawable(),
       strength(5),
       farbe(0x9B000000)
 {}
 
-AlphaFeld::~AlphaFeld() {}
+AlphaField::~AlphaField() {}
 
 // non-constant
-void AlphaFeld::setStrength(int st) // sets the strength
+void AlphaField::setStrength(int st) // sets the strength
 {
     strength = st;
     rend = 1;
 }
 
-void AlphaFeld::setFarbe(int f) // sets the color
+void AlphaField::setFarbe(int f) // sets the color
 {
     farbe = f;
     rend = 1;
 }
 
-void AlphaFeld::render(Image& zRObj) // draws to zRObj
+void AlphaField::render(Image& zRObj) // draws to zRObj
 {
     Drawable::render(zRObj);
     int br = gr.x - 1;
@@ -80,25 +80,25 @@ void AlphaFeld::render(Image& zRObj) // draws to zRObj
 }
 
 // constant
-int AlphaFeld::getStrength() const // returns the strength
+int AlphaField::getStrength() const // returns the strength
 {
     return strength;
 }
 
-int AlphaFeld::getFarbe() const // returns the color
+int AlphaField::getFarbe() const // returns the color
 {
     return farbe;
 }
 
-Drawable* AlphaFeld::dublizieren() const // copies the drawing object
+Drawable* AlphaField::dublizieren() const // copies the drawing object
 {
-    AlphaFeld* obj = new AlphaFeld();
+    AlphaField* obj = new AlphaField();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStrength(strength);
     obj->setFarbe(farbe);

AlphaField.h

@@ -1,16 +1,16 @@
-#ifndef AlphaFeld_H
-#define AlphaFeld_H
+#ifndef AlphaField_H
+#define AlphaField_H
 
 #include "Drawing.h"
 
 namespace Framework
 {
     class Image;      //! Image.h
-    class AlphaFeld; //! from this file
+    class AlphaField; //! from this file
 
     //! A 2D GUI Framework drawing that represents a color gradient
     //! towards a rectangle
-    class AlphaFeld : public Drawable
+    class AlphaField : public Drawable
     {
     private:
         int strength;
@@ -18,9 +18,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT AlphaFeld();
+        DLLEXPORT AlphaField();
         //! Destructor
-        DLLEXPORT virtual ~AlphaFeld();
+        DLLEXPORT virtual ~AlphaField();
         //! Sets the strength of the transition. This is the value by which the
         //! alpha value of the color decreases for each pixel inward
         //! \param st The strength

Animation.cpp

@@ -37,7 +37,7 @@ void Animation2DData::unlock()
     cs.unlock();
 }
 
-void Animation2DData::ladeAnimation(InitDatei* datei)
+void Animation2DData::ladeAnimation(InitFile* datei)
 {
     if (!datei) return;
     reset();
@@ -76,8 +76,8 @@ void Animation2DData::ladeAnimation(InitDatei* datei)
                 = pfad.getTeilText(0, pfad.getLength() - name->getLength() - 1);
             pfad.setText(*tmp);
             tmp->release();
-            LTDBDatei* dat = new LTDBDatei();
-            dat->setDatei(dynamic_cast<Text*>(pfad.getThis()));
+            LTDBFile* dat = new LTDBFile();
+            dat->setFile(dynamic_cast<Text*>(pfad.getThis()));
             dat->leseDaten(0);
             bilder[j] = dat->laden(0, name);
             dat->release();
@@ -98,7 +98,7 @@ void Animation2DData::ladeAnimation(InitDatei* datei)
     datei->release();
 }
 
-void Animation2DData::ladeAnimation(LTDBDatei* datei)
+void Animation2DData::ladeAnimation(LTDBFile* datei)
 {
     if (!datei) return;
     reset();
@@ -390,10 +390,10 @@ Drawable* Animation2D::dublizieren() const
     Animation2D* ret = new Animation2D();
     ret->setPosition(pos);
     ret->setSize(gr);
-    ret->setMausEreignisParameter(makParam);
-    ret->setTastaturEreignisParameter(takParam);
-    ret->setMausEreignis(mak);
-    ret->setTastaturEreignis(tak);
+    ret->setMouseEventParameter(makParam);
+    ret->setKeyboardEventParameter(takParam);
+    ret->setMouseEvent(mak);
+    ret->setKeyboardEvent(tak);
     if (toolTip) ret->setToolTipZ((ToolTip*)toolTip->dublizieren());
     if (data)
         ret->setAnimationDataZ(dynamic_cast<Animation2DData*>(data->getThis()));

Animation.h

@@ -7,8 +7,8 @@
 namespace Framework
 {
     class Image;      //! Image.h
-    class LTDBDatei; //! FileSystem.h
-    class InitDatei; //! InitFile.h
+    class LTDBFile; //! FileSystem.h
+    class InitFile; //! InitFile.h
     class Border;    //! Border.h
 
     //! Contains all images of a video animation
@@ -35,18 +35,18 @@ namespace Framework
         //! If lock() is called by two threads, the last one waits until the
         //! first one has called unlock().
         DLLEXPORT void unlock();
-        //! Loads all images from an InitDatei. The values 'fps',
+        //! Loads all images from an InitFile. The values 'fps',
         //! 'wiederhohlen' (true, false), 'transparent' (true, false) are also
         //! interpreted. The images must be in the correct order in the file.
         //! The name of the values does not matter, the value is the path to
         //! the ltdb file with /imagename appended. Example: fps=30
         //!           x=a.ltdb\aaaa.jpg
         //!           y=a.ltdb\aaab.jpg
-        //! \param datei The already loaded InitDatei
-        DLLEXPORT void ladeAnimation(InitDatei* datei);
+        //! \param datei The already loaded InitFile
+        DLLEXPORT void ladeAnimation(InitFile* datei);
         //! Loads all images from an LTDB file in the order they are stored.
         //! \param datei The LTDB file
-        DLLEXPORT void ladeAnimation(LTDBDatei* datei);
+        DLLEXPORT void ladeAnimation(LTDBFile* datei);
         //! Sets the frames per second of the video animation
         //! \param fps The number of frames per second
         DLLEXPORT void setFPS(int fps);

Array.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <functional>
 #include <stdexcept>
@@ -13,20 +13,20 @@ namespace Framework
 {
     template<class TYP>
     //! An entry in a linked list
-    struct ArrayEintrag
+    struct ArrayEntry
     {
         TYP var;
         bool set;
-        ArrayEintrag<TYP>* next;
+        ArrayEntry<TYP>* next;
 
-        ArrayEintrag()
+        ArrayEntry()
             : var(),
               set(0),
               next(0)
         {}
 
         //! Sets the entry to the values of the other entry
-        ArrayEintrag& operator=(ArrayEintrag& r)
+        ArrayEntry& operator=(ArrayEntry& r)
         {
             var = r.var;
             set = r.set;
@@ -49,11 +49,11 @@ namespace Framework
         }
 
         //! Increments through the linked list
-        ArrayEintrag<TYP>& operator++() //! prefix
+        ArrayEntry<TYP>& operator++() //! prefix
         {
             if (!next)
             {
-                ArrayEintrag<TYP> tmp;
+                ArrayEntry<TYP> tmp;
                 tmp.set = 0;
                 tmp.next = 0;
                 *this = tmp;
@@ -64,11 +64,11 @@ namespace Framework
         }
 
         //! Increments through the linked list
-        ArrayEintrag<TYP>& operator++(int) //! postfix
+        ArrayEntry<TYP>& operator++(int) //! postfix
         {
             if (!next)
             {
-                ArrayEintrag<TYP> tmp;
+                ArrayEntry<TYP> tmp;
                 tmp.set = 0;
                 tmp.next = 0;
                 *this = tmp;
@@ -87,13 +87,13 @@ namespace Framework
         : public Iterator<TYP, ArrayIterator<TYP>>
     {
     private:
-        ArrayEintrag<TYP>* current;
-        const std::function<ArrayEintrag<TYP>*(ArrayEintrag<TYP>* removed)>*
+        ArrayEntry<TYP>* current;
+        const std::function<ArrayEntry<TYP>*(ArrayEntry<TYP>* removed)>*
             onRemove;
 
     public:
-        ArrayIterator(ArrayEintrag<TYP>* start,
-            const std::function<ArrayEintrag<TYP>*(ArrayEintrag<TYP>* removed)>*
+        ArrayIterator(ArrayEntry<TYP>* start,
+            const std::function<ArrayEntry<TYP>*(ArrayEntry<TYP>* removed)>*
                 onRemove)
         {
             this->onRemove = onRemove;
@@ -124,7 +124,7 @@ namespace Framework
 
         bool hasNext() override
         {
-            ArrayEintrag<TYP>* next = current->next;
+            ArrayEntry<TYP>* next = current->next;
             while (next && !next->set)
             {
                 next = next->next;
@@ -219,23 +219,23 @@ namespace Framework
     class Array : public virtual ReferenceCounter
     {
     private:
-        ArrayEintrag<TYP>* entries;
-        ArrayEintrag<TYP>* last;
+        ArrayEntry<TYP>* entries;
+        ArrayEntry<TYP>* last;
         int count;
-        std::function<ArrayEintrag<TYP>*(ArrayEintrag<TYP>* removed)> onRemove;
+        std::function<ArrayEntry<TYP>*(ArrayEntry<TYP>* removed)> onRemove;
 
     public:
         //! Creates a new linked list
         Array() noexcept
             : ReferenceCounter()
         {
-            entries = new ArrayEintrag<TYP>();
+            entries = new ArrayEntry<TYP>();
             entries->set = 0;
             entries->next = 0;
             last = entries;
             count = 0;
-            onRemove = [this](ArrayEintrag<TYP>* entry) {
-                if (!entry) return (ArrayEintrag<TYP>*)0;
+            onRemove = [this](ArrayEntry<TYP>* entry) {
+                if (!entry) return (ArrayEntry<TYP>*)0;
                 if (entry->next)
                 {
                     entry->var = entry->next->var;
@@ -243,7 +243,7 @@ namespace Framework
                 }
                 else
                     entry->set = 0;
-                ArrayEintrag<TYP>* del = entry->next;
+                ArrayEntry<TYP>* del = entry->next;
                 if (entry->next)
                     entry->next = entry->next->next;
                 else
@@ -265,7 +265,7 @@ namespace Framework
         Array(const Array& arr)
             : Array()
         {
-            int anz = arr.getEintragAnzahl();
+            int anz = arr.getEntryCount();
             for (int i = 0; i < anz; i++)
                 add(arr.get(i));
         }
@@ -288,7 +288,7 @@ namespace Framework
                 count++;
                 return;
             }
-            last->next = new ArrayEintrag<TYP>();
+            last->next = new ArrayEntry<TYP>();
             last = last->next;
             last->set = 1;
             last->var = t;
@@ -308,10 +308,10 @@ namespace Framework
                 add(t);
                 return;
             }
-            ArrayEintrag<TYP>* e = entries;
+            ArrayEntry<TYP>* e = entries;
             for (int a = 0; a < i; ++a)
                 e = e->next;
-            ArrayEintrag<TYP>* ne = new ArrayEintrag<TYP>();
+            ArrayEntry<TYP>* ne = new ArrayEntry<TYP>();
             ne->var = e->var;
             ne->set = e->set;
             ne->next = e->next;
@@ -329,7 +329,7 @@ namespace Framework
         {
             if (i < 0 || i >= count)
                 throwOutOfRange(__FILE__, __LINE__, i, count);
-            ArrayEintrag<TYP>* e = entries;
+            ArrayEntry<TYP>* e = entries;
             for (int a = 0; a < i; ++a)
                 e = e->next;
             e->var = t;
@@ -356,7 +356,7 @@ namespace Framework
         {
             if (i < 0 || i >= count)
                 throwOutOfRange(__FILE__, __LINE__, i, count);
-            ArrayEintrag<TYP>* e = entries;
+            ArrayEntry<TYP>* e = entries;
             for (int a = 0; a < i; ++a)
                 e = e->next;
             onRemove(e);
@@ -366,7 +366,7 @@ namespace Framework
         //! \param value The value of the element to be deleted
         void removeValue(TYP value)
         {
-            ArrayEintrag<TYP>* e = entries;
+            ArrayEntry<TYP>* e = entries;
             while (e->var != value)
             {
                 if (!e->next) return;
@@ -380,7 +380,7 @@ namespace Framework
             }
             else
                 e->set = 0;
-            ArrayEintrag<TYP>* del = e->next;
+            ArrayEntry<TYP>* del = e->next;
             if (e->next)
                 e->next = e->next->next;
             else
@@ -408,8 +408,8 @@ namespace Framework
         //! Deletes all elements of the list
         void leeren()
         {
-            ArrayEintrag<TYP>* e2 = 0;
-            for (ArrayEintrag<TYP>* e = entries->next; e; e = e->next)
+            ArrayEntry<TYP>* e2 = 0;
+            for (ArrayEntry<TYP>* e = entries->next; e; e = e->next)
             {
                 delete e2;
                 e2 = e;
@@ -434,7 +434,7 @@ namespace Framework
         }
 
         //! Returns how many elements are in the list
-        int getEintragAnzahl() const
+        int getEntryCount() const
         {
             return count;
         }
@@ -442,12 +442,12 @@ namespace Framework
         //! Returns the value of the i-th element
         //! \param i The index of the sought element
         //! throws:
-        //! \param std:out_of_range if i < 0 or i >= getEintragAnzahl()
+        //! \param std:out_of_range if i < 0 or i >= getEntryCount()
         TYP get(int i) const
         {
             if (i < 0 || i >= count)
                 throwOutOfRange(__FILE__, __LINE__, i, count);
-            ArrayEintrag<TYP>* e = entries;
+            ArrayEntry<TYP>* e = entries;
             for (int a = 0; a < i && e; ++a)
                 e = e->next;
             return e->var;
@@ -466,7 +466,7 @@ namespace Framework
         int getWertIndex(TYP t) const
         {
             int ret = 0;
-            for (ArrayEintrag<TYP>* e = entries; e; e = e->next)
+            for (ArrayEntry<TYP>* e = entries; e; e = e->next)
             {
                 if (e->set && e->var == t) return ret;
                 ++ret;
@@ -506,7 +506,7 @@ namespace Framework
         Array& operator=(const Array& arr)
         {
             leeren();
-            int anz = arr.getEintragAnzahl();
+            int anz = arr.getEntryCount();
             for (int i = 0; i < anz; i++)
                 add(arr.get(i));
             return *this;
@@ -524,10 +524,10 @@ namespace Framework
     class RCArray : public virtual ReferenceCounter
     {
     private:
-        ArrayEintrag<TYP*>* entries;
-        ArrayEintrag<TYP*>* last;
+        ArrayEntry<TYP*>* entries;
+        ArrayEntry<TYP*>* last;
         int count;
-        std::function<ArrayEintrag<TYP*>*(ArrayEintrag<TYP*>* removed)>
+        std::function<ArrayEntry<TYP*>*(ArrayEntry<TYP*>* removed)>
             onRemove;
 
     public:
@@ -535,14 +535,14 @@ namespace Framework
         RCArray() noexcept
             : ReferenceCounter()
         {
-            entries = new ArrayEintrag<TYP*>();
+            entries = new ArrayEntry<TYP*>();
             entries->var = 0;
             entries->set = 0;
             entries->next = 0;
             last = entries;
             count = 0;
-            onRemove = [this](ArrayEintrag<TYP*>* entry) {
-                if (!entry) return (ArrayEintrag<TYP*>*)0;
+            onRemove = [this](ArrayEntry<TYP*>* entry) {
+                if (!entry) return (ArrayEntry<TYP*>*)0;
                 if (entry->next)
                 {
                     if (entry->set && entry->var) entry->var->release();
@@ -554,7 +554,7 @@ namespace Framework
                     if (entry->set && entry->var) entry->var->release();
                     entry->set = 0;
                 }
-                ArrayEintrag<TYP*>* del = entry->next;
+                ArrayEntry<TYP*>* del = entry->next;
                 if (entry->next)
                     entry->next = entry->next->next;
                 else
@@ -576,7 +576,7 @@ namespace Framework
         RCArray(const RCArray& arr)
             : RCArray()
         {
-            int anz = arr.getEintragAnzahl();
+            int anz = arr.getEntryCount();
             for (int i = 0; i < anz; i++)
                 add(arr.get(i));
         }
@@ -599,7 +599,7 @@ namespace Framework
                 last->set = 1;
                 return;
             }
-            last->next = new ArrayEintrag<TYP*>();
+            last->next = new ArrayEntry<TYP*>();
             last = last->next;
             last->var = t;
             last->set = 1;
@@ -618,10 +618,10 @@ namespace Framework
                 add(t);
                 return;
             }
-            ArrayEintrag<TYP*>* e = entries;
+            ArrayEntry<TYP*>* e = entries;
             for (int a = 0; a < i; ++a)
                 e = e->next;
-            ArrayEintrag<TYP*>* ne = new ArrayEintrag<TYP*>();
+            ArrayEntry<TYP*>* ne = new ArrayEntry<TYP*>();
             ne->var = e->var;
             ne->set = e->set;
             ne->next = e->next;
@@ -639,7 +639,7 @@ namespace Framework
         {
             if (i < 0 || i >= count)
                 throwOutOfRange(__FILE__, __LINE__, i, count);
-            ArrayEintrag<TYP*>* e = entries;
+            ArrayEntry<TYP*>* e = entries;
             for (int a = 0; a < i; ++a)
                 e = e->next;
             if (e->set && e->var) e->var->release();
@@ -667,7 +667,7 @@ namespace Framework
         {
             if (i < 0 || i >= count)
                 throwOutOfRange(__FILE__, __LINE__, i, count);
-            ArrayEintrag<TYP*>* e = entries;
+            ArrayEntry<TYP*>* e = entries;
             for (int a = 0; a < i; ++a)
                 e = e->next;
             if (e->next)
@@ -681,7 +681,7 @@ namespace Framework
                 if (e->set && e->var) e->var->release();
                 e->set = 0;
             }
-            ArrayEintrag<TYP*>* del = e->next;
+            ArrayEntry<TYP*>* del = e->next;
             if (e->next)
                 e->next = e->next->next;
             else
@@ -710,7 +710,7 @@ namespace Framework
         //! Deletes all elements of the list
         void leeren()
         {
-            for (ArrayEintrag<TYP*>* e = entries->next; e;)
+            for (ArrayEntry<TYP*>* e = entries->next; e;)
             {
                 if (e && e->var && e->set) e->var->release();
                 auto tmp = e->next;
@@ -738,7 +738,7 @@ namespace Framework
         }
 
         //! Returns how many elements are in the list
-        int getEintragAnzahl() const
+        int getEntryCount() const
         {
             return count;
         }
@@ -755,7 +755,7 @@ namespace Framework
         {
             if (i < 0 || i >= count)
                 throwOutOfRange(__FILE__, __LINE__, i, count);
-            ArrayEintrag<TYP*>* e = entries;
+            ArrayEntry<TYP*>* e = entries;
             for (int a = 0; a < i && e; ++a)
                 e = e->next;
             if (e && e->set && e->var)
@@ -770,7 +770,7 @@ namespace Framework
         {
             if (i < 0 || i >= count)
                 throwOutOfRange(__FILE__, __LINE__, i, count);
-            ArrayEintrag<TYP*>* e = entries;
+            ArrayEntry<TYP*>* e = entries;
             for (int a = 0; a < i && e; ++a)
                 e = e->next;
             if (e && e->set && e->var) return (TYP*)e->var;
@@ -830,7 +830,7 @@ namespace Framework
         RCArray& operator=(const RCArray& arr)
         {
             leeren();
-            int anz = arr.getEintragAnzahl();
+            int anz = arr.getEntryCount();
             for (int i = 0; i < anz; i++)
                 add(arr.get(i));
             return *this;

Assembly.cpp

@@ -1,4 +1,4 @@
-#include "Assembly.h"
+#include "Assembly.h"
 
 #include "InMemoryBuffer.h"
 
@@ -1583,7 +1583,7 @@ isFPRegisterOrMEmoryAccess(Framework::Assembly::MemoryBlockSize regSize,
 
 void __intializeMachineCodeTranslationTable()
 {
-    if (!OperationCodeTable::machineCodeTranslationTable.getEintragAnzahl())
+    if (!OperationCodeTable::machineCodeTranslationTable.getEntryCount())
     {
         OperationCodeTable::machineCodeTranslationTable.add(
             new OperationCodeTable(Framework::Assembly::ADD,
@@ -8123,7 +8123,7 @@ void Framework::Assembly::AssemblyBlock::addBlock(AssemblyBlock* block,
     {
         if (instr->getOperation() == RET)
         {
-            if (index != block->instructions.getEintragAnzahl() - 1)
+            if (index != block->instructions.getEntryCount() - 1)
             {
                 returnFound = true;
                 instructions.add(new Instruction(
@@ -8255,10 +8255,10 @@ Framework::Assembly::AssemblyBlock::getInstructions() const
 void Framework::Assembly::AssemblyBlock::optimize()
 {
     RCArray<Instruction> optimizedInstructions;
-    for (int index = 0; index < instructions.getEintragAnzahl(); index++)
+    for (int index = 0; index < instructions.getEntryCount(); index++)
     {
         Instruction* curr = instructions.z(index);
-        if (index < instructions.getEintragAnzahl() - 1
+        if (index < instructions.getEntryCount() - 1
             && curr->getOperation() == MOV && curr->getArguments().size() == 2
             && curr->getArguments().at(0)->asGPRegisterArgument()
             && curr->getArguments().at(1)->asMemoryAccessArgument())
@@ -8343,14 +8343,14 @@ void* Framework::Assembly::AssemblyBlock::compile()
         }
     }
     // replace return instructions with jumps to the end
-    if (restoreInstructions.getEintragAnzahl() > 0)
+    if (restoreInstructions.getEntryCount() > 0)
     {
         bool needed = false;
-        for (int index = 0; index < instructions.getEintragAnzahl(); index++)
+        for (int index = 0; index < instructions.getEntryCount(); index++)
         {
             if (instructions.z(index)->getOperation() == RET)
             {
-                if (index < instructions.getEintragAnzahl() - 1)
+                if (index < instructions.getEntryCount() - 1)
                 {
                     needed = true;
                     instructions.set(

Border.cpp

@@ -217,10 +217,10 @@ Drawable* LBorder::dublizieren() const // Copies the drawing
     Border* obj = new LBorder();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setBreaks(breaks);
     obj->setAlpha(alpha);
@@ -359,10 +359,10 @@ Drawable* Border3D::dublizieren() const // Copies the drawing
     Border* obj = new Border3D();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setBreaks(breaks);
     obj->setAlpha(alpha);

Button.cpp

@@ -15,9 +15,9 @@
 
 using namespace Framework;
 
-// Contents of the Knopf class from Button.h
+// Contents of the Button class from Button.h
 // Constructor
-Knopf::Knopf()
+Button::Button()
     : TextField(),
       klickFarbe(0xFF000000),
       klickImage(0),
@@ -26,26 +26,26 @@ Knopf::Knopf()
 {
     style
         = Style::Erlaubt | Style::Buffered | Style::KlickBuffer | Style::Border;
-    this->setMausEreignis(_ret1ME);
+    this->setMouseEvent(_ret1ME);
     setSchriftFarbe(0xFFFFFFFF);
     setSchriftSize(12);
     setBorderWidth(2);
     setBorderColor(0xFF00FF00);
-    setAlphaFeldFarbe(0x5500FF00);
-    setAlphaFeldStrength(-5);
+    setAlphaFieldColor(0x5500FF00);
+    setAlphaFieldStrength(-5);
     setKBFarbe(0xFF000000);
     setKBStrength(20);
     addStyle(TextField::Style::Center);
 }
 
 // Destructor
-Knopf::~Knopf()
+Button::~Button()
 {
     if (klickBuffer) klickBuffer->release();
     if (klickImage) klickImage->release();
 }
 
-void Knopf::doMausEreignis(MausEreignis& me, bool userRet) // Mouse event
+void Button::doMouseEvent(MouseEvent& me, bool userRet) // Mouse event
 {
     if (hatStyleNicht(Style::Erlaubt) || !userRet) return;
     if (me.id == ME_Betritt)
@@ -70,13 +70,13 @@ void Knopf::doMausEreignis(MausEreignis& me, bool userRet) // Mouse event
 }
 
 // non-constant
-void Knopf::setKlickFarbe(int fc) // sets the click color
+void Button::setKlickFarbe(int fc) // sets the click color
 {
     klickFarbe = fc;
     rend = 1;
 }
 
-void Knopf::setKlickImage(Image* bild) // sets the click image
+void Button::setKlickImage(Image* bild) // sets the click image
 {
     if (bild)
     {
@@ -91,39 +91,39 @@ void Knopf::setKlickImage(Image* bild) // sets the click image
     }
 }
 
-void Knopf::setKlickImageZ(Image* bild) // sets a pointer to the click image
+void Button::setKlickImageZ(Image* bild) // sets a pointer to the click image
 {
     if (klickImage) klickImage->release();
     klickImage = bild;
     rend = 1;
 }
 
-void Knopf::setKBZ(AlphaFeld* af)
+void Button::setKBZ(AlphaField* af)
 {
     if (klickBuffer) klickBuffer->release();
     klickBuffer = af;
     rend = 1;
 }
 
-void Knopf::setKBStrength(int st) // sets the click buffer strength
+void Button::setKBStrength(int st) // sets the click buffer strength
 {
-    if (!klickBuffer) klickBuffer = new AlphaFeld();
+    if (!klickBuffer) klickBuffer = new AlphaField();
     klickBuffer->setStrength(st);
     rend = 1;
 }
 
-void Knopf::setKBFarbe(int fc) // sets the click buffer color
+void Button::setKBFarbe(int fc) // sets the click buffer color
 {
-    if (!klickBuffer) klickBuffer = new AlphaFeld();
+    if (!klickBuffer) klickBuffer = new AlphaField();
     klickBuffer->setFarbe(fc);
     rend = 1;
 }
 
 // Processes mouse messages
 //  te: The event triggered by the keyboard input
-void Knopf::doTastaturEreignis(TastaturEreignis& te) {}
+void Button::doKeyboardEvent(KeyboardEvent& te) {}
 
-void Knopf::render(Image& zRObj) // renders int zRObj
+void Button::render(Image& zRObj) // renders int zRObj
 {
     if (!hatStyle(Style::Sichtbar)) return;
     addStyle(TextField::Style::Center);
@@ -172,56 +172,56 @@ void Knopf::render(Image& zRObj) // renders int zRObj
 }
 
 // constant
-int Knopf::getKlickFarbe() const // returns the click color
+int Button::getKlickFarbe() const // returns the click color
 {
     return klickFarbe;
 }
 
-Image* Knopf::getKlickImage() const // returns the click image
+Image* Button::getKlickImage() const // returns the click image
 {
     if (!klickImage) return 0;
     return dynamic_cast<Image*>(klickImage->getThis());
 }
 
-Image* Knopf::zKlickImage() const // returns a pointer to the click image
+Image* Button::zKlickImage() const // returns a pointer to the click image
 {
     return klickImage;
 }
 
-AlphaFeld* Knopf::getKB() const // returns the click buffer
+AlphaField* Button::getKB() const // returns the click buffer
 {
     if (!klickBuffer) return 0;
-    return dynamic_cast<AlphaFeld*>(klickBuffer->getThis());
+    return dynamic_cast<AlphaField*>(klickBuffer->getThis());
 }
 
-AlphaFeld*
-Knopf::zKB() const // returns the click buffer without reference counter
+AlphaField*
+Button::zKB() const // returns the click buffer without reference counter
 {
     return klickBuffer;
 }
 
-int Knopf::getKBFarbe() const // returns the click buffer color
+int Button::getKBFarbe() const // returns the click buffer color
 {
     if (!klickBuffer) return 0;
     return klickBuffer->getFarbe();
 }
 
-int Knopf::getKBStrength() const // returns the click buffer strength
+int Button::getKBStrength() const // returns the click buffer strength
 {
     if (!klickBuffer) return 0;
     return klickBuffer->getStrength();
 }
 
 Drawable*
-Knopf::dublizieren() const // creates a copy of the drawing and returns it
+Button::dublizieren() const // creates a copy of the drawing and returns it
 {
-    Knopf* obj = new Knopf();
+    Button* obj = new Button();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStyle(style);
     obj->setSchriftSize(getSchriftSize());
@@ -230,7 +230,7 @@ Knopf::dublizieren() const // creates a copy of the drawing and returns it
     obj->setHintergrundFarbe(hintergrundFarbe);
     obj->setSchriftFarbe(getSchriftFarbe());
     if (hintergrundFeld)
-        obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
+        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
     if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
     if (hintergrundImage)
         obj->setHintergrundImage(
@@ -253,13 +253,13 @@ Knopf::dublizieren() const // creates a copy of the drawing and returns it
     // obj->setAuswahl( getSelectionPos(), getCursorPos() );
     obj->setKlickFarbe(klickFarbe);
     if (klickImage) obj->setKlickImage(dynamic_cast<Image*>(klickImage->getThis()));
-    if (klickBuffer) obj->setKBZ((AlphaFeld*)klickBuffer->dublizieren());
+    if (klickBuffer) obj->setKBZ((AlphaField*)klickBuffer->dublizieren());
     return obj;
 }
 
-// Contents of the KontrollKnopf class from Button.h
+// Contents of the CheckBox class from Button.h
 // Constructor
-KontrollKnopf::KontrollKnopf()
+CheckBox::CheckBox()
     : DrawableBackground(),
       txt(0),
       sTxt(0),
@@ -281,7 +281,7 @@ KontrollKnopf::KontrollKnopf()
 }
 
 // Destructor
-KontrollKnopf::~KontrollKnopf()
+CheckBox::~CheckBox()
 {
     if (txt) txt->release();
     if (sTxt) sTxt->release();
@@ -294,8 +294,8 @@ KontrollKnopf::~KontrollKnopf()
     if (textRd) textRd->release();
 }
 
-void KontrollKnopf::doMausEreignis(
-    MausEreignis& me, bool userRet) // process mouse events
+void CheckBox::doMouseEvent(
+    MouseEvent& me, bool userRet) // process mouse events
 {
     if (me.id == ME_Leaves || !userRet) style &= ~Style::MausKlick;
     if (hatStyleNicht(TextField::Style::Erlaubt) || !userRet) return;
@@ -311,14 +311,14 @@ void KontrollKnopf::doMausEreignis(
 }
 
 // non-constant
-void KontrollKnopf::setTextZ(Text* txt) // sets the text
+void CheckBox::setTextZ(Text* txt) // sets the text
 {
     if (this->txt) this->txt->release();
     this->txt = txt;
     rend = 1;
 }
 
-void KontrollKnopf::setText(Text* txt)
+void CheckBox::setText(Text* txt)
 {
     if (!this->txt) this->txt = new Text();
     this->txt->setText(txt->getText());
@@ -326,21 +326,21 @@ void KontrollKnopf::setText(Text* txt)
     rend = 1;
 }
 
-void KontrollKnopf::setText(const char* txt)
+void CheckBox::setText(const char* txt)
 {
     if (!this->txt) this->txt = new Text();
     this->txt->setText(txt);
     rend = 1;
 }
 
-void KontrollKnopf::setSTextZ(Text* txt) // sets the text when selected
+void CheckBox::setSTextZ(Text* txt) // sets the text when selected
 {
     if (sTxt) sTxt->release();
     sTxt = txt;
     rend = 1;
 }
 
-void KontrollKnopf::setSText(Text* txt)
+void CheckBox::setSText(Text* txt)
 {
     if (!sTxt) sTxt = new Text();
     sTxt->setText(txt->getText());
@@ -348,20 +348,20 @@ void KontrollKnopf::setSText(Text* txt)
     rend = 1;
 }
 
-void KontrollKnopf::setSText(const char* txt)
+void CheckBox::setSText(const char* txt)
 {
     if (!sTxt) sTxt = new Text();
     sTxt->setText(txt);
     rend = 1;
 }
 
-void KontrollKnopf::setTextRendererZ(TextRenderer* textRd)
+void CheckBox::setTextRendererZ(TextRenderer* textRd)
 {
     if (this->textRd) this->textRd->release();
     this->textRd = textRd;
 }
 
-void KontrollKnopf::setFontZ(Font* schrift) // sets the font
+void CheckBox::setFontZ(Font* schrift) // sets the font
 {
     if (!this->textRd)
         textRd = new TextRenderer(schrift);
@@ -370,38 +370,38 @@ void KontrollKnopf::setFontZ(Font* schrift) // sets the font
     rend = 1;
 }
 
-void KontrollKnopf::setSFarbe(int f) // sets the font color
+void CheckBox::setSFarbe(int f) // sets the font color
 {
     sF = f;
     rend = 1;
 }
 
-void KontrollKnopf::setSSize(int gr) // sets the font size
+void CheckBox::setSSize(int gr) // sets the font size
 {
     sGr = gr;
     rend = 1;
 }
 
-void KontrollKnopf::setSBgFarbe(int f) // sets the select background color
+void CheckBox::setSBgFarbe(int f) // sets the select background color
 {
     sBgF = f;
     rend = 1;
 }
 
-void KontrollKnopf::setKBgFarbe(int f) // sets the click background color
+void CheckBox::setKBgFarbe(int f) // sets the click background color
 {
     kBgF = f;
     rend = 1;
 }
 
-void KontrollKnopf::setSBgImageZ(Image* b) // sets the select background image
+void CheckBox::setSBgImageZ(Image* b) // sets the select background image
 {
     if (sBgB) sBgB->release();
     sBgB = b;
     rend = 1;
 }
 
-void KontrollKnopf::setSBgImage(Image* b)
+void CheckBox::setSBgImage(Image* b)
 {
     if (!sBgB) sBgB = new Image();
     sBgB->neuImage(b->getBreite(), b->getHeight(), 0);
@@ -410,14 +410,14 @@ void KontrollKnopf::setSBgImage(Image* b)
     rend = 1;
 }
 
-void KontrollKnopf::setKBgImageZ(Image* b) // sets the click background image
+void CheckBox::setKBgImageZ(Image* b) // sets the click background image
 {
     if (kBgB) kBgB->release();
     kBgB = b;
     rend = 1;
 }
 
-void KontrollKnopf::setKBgImage(Image* b)
+void CheckBox::setKBgImage(Image* b)
 {
     if (!kBgB) kBgB = new Image();
     kBgB->neuImage(b->getBreite(), b->getHeight(), 0);
@@ -426,55 +426,55 @@ void KontrollKnopf::setKBgImage(Image* b)
     rend = 1;
 }
 
-void KontrollKnopf::setSAlphaFeldZ(AlphaFeld* af) // sets the select AlphaFeld
+void CheckBox::setSAlphaFieldZ(AlphaField* af) // sets the select AlphaField
 {
     if (sAf) sAf->release();
     sAf = af;
     rend = 1;
 }
 
-void KontrollKnopf::setSAFFarbe(int f) // sets the select AlphaFeld color
+void CheckBox::setSAFFarbe(int f) // sets the select AlphaField color
 {
-    if (!sAf) sAf = new AlphaFeld();
+    if (!sAf) sAf = new AlphaField();
     sAf->setFarbe(f);
     rend = 1;
 }
 
-void KontrollKnopf::setSAFStrength(int st) // sets the select AlphaFeld strength
+void CheckBox::setSAFStrength(int st) // sets the select AlphaField strength
 {
-    if (!sAf) sAf = new AlphaFeld();
+    if (!sAf) sAf = new AlphaField();
     sAf->setStrength(st);
     rend = 1;
 }
 
-void KontrollKnopf::setKAlphaFeldZ(AlphaFeld* af) // sets the click AlphaFeld
+void CheckBox::setKAlphaFieldZ(AlphaField* af) // sets the click AlphaField
 {
     if (kAf) kAf->release();
     kAf = af;
     rend = 1;
 }
 
-void KontrollKnopf::setKAFFarbe(int f) // sets the click AlphaFeld color
+void CheckBox::setKAFFarbe(int f) // sets the click AlphaField color
 {
-    if (!kAf) kAf = new AlphaFeld();
+    if (!kAf) kAf = new AlphaField();
     kAf->setFarbe(f);
     rend = 1;
 }
 
-void KontrollKnopf::setKAFStrength(int st) // sets the click AlphaFeld strength
+void CheckBox::setKAFStrength(int st) // sets the click AlphaField strength
 {
-    if (!kAf) kAf = new AlphaFeld();
+    if (!kAf) kAf = new AlphaField();
     kAf->setStrength(st);
     rend = 1;
 }
 
-void KontrollKnopf::loadData(LTDBDatei* dat) // loading the system images
+void CheckBox::loadData(LTDBFile* dat) // loading the system images
 {
-    if (DateiExistiert(new Text("data/normal.ltdb"))
+    if (FileExists(new Text("data/normal.ltdb"))
         && (!dat || !dat->istOffen()))
     {
-        LTDBDatei* dat = new LTDBDatei();
-        dat->setDatei(new Text("data/normal.ltdb"));
+        LTDBFile* dat = new LTDBFile();
+        dat->setFile(new Text("data/normal.ltdb"));
         dat->leseDaten(0);
         kasten = dat->laden(0, new Text("kasten.gif"));
         sKasten = dat->laden(0, new Text("skasten.gif"));
@@ -488,13 +488,13 @@ void KontrollKnopf::loadData(LTDBDatei* dat) // loading the system images
     rend = 1;
 }
 
-void KontrollKnopf::loadData(
+void CheckBox::loadData(
     const char* ltdb) // loading the system images with a specified LTDB file
 {
-    if (DateiExistiert(new Text(ltdb)))
+    if (FileExists(new Text(ltdb)))
     {
-        LTDBDatei* dat = new LTDBDatei();
-        dat->setDatei(new Text(ltdb));
+        LTDBFile* dat = new LTDBFile();
+        dat->setFile(new Text(ltdb));
         dat->leseDaten(0);
         kasten = dat->laden(0, new Text("kasten.gif"));
         sKasten = dat->laden(0, new Text("skasten.gif"));
@@ -503,7 +503,7 @@ void KontrollKnopf::loadData(
     }
 }
 
-void KontrollKnopf::render(Image& zRObj) // renders into zRObj
+void CheckBox::render(Image& zRObj) // renders into zRObj
 {
     if (!hatStyle(Style::Sichtbar)) return;
     removeStyle(Style::VScroll | Style::HScroll);
@@ -685,93 +685,93 @@ void KontrollKnopf::render(Image& zRObj) // renders into zRObj
 }
 
 // constant
-Text* KontrollKnopf::getText() const // returns the text
+Text* CheckBox::getText() const // returns the text
 {
     return txt ? dynamic_cast<Text*>(txt->getThis()) : 0;
 }
 
-Text* KontrollKnopf::zText() const
+Text* CheckBox::zText() const
 {
     return txt;
 }
 
-Text* KontrollKnopf::getSText() const // returns the select text
+Text* CheckBox::getSText() const // returns the select text
 {
     return sTxt ? dynamic_cast<Text*>(sTxt->getThis()) : 0;
 }
 
-Text* KontrollKnopf::zSText() const
+Text* CheckBox::zSText() const
 {
     return sTxt;
 }
 
-Font* KontrollKnopf::getFont() const // returns the font
+Font* CheckBox::getFont() const // returns the font
 {
     return textRd ? textRd->getFont() : 0;
 }
 
-Font* KontrollKnopf::zFont() const
+Font* CheckBox::zFont() const
 {
     return textRd ? textRd->zFont() : 0;
 }
 
-int KontrollKnopf::getSFarbe() const // returns the font color
+int CheckBox::getSFarbe() const // returns the font color
 {
     return sF;
 }
 
-int KontrollKnopf::getSSize() const // returns the font size
+int CheckBox::getSSize() const // returns the font size
 {
     return sGr;
 }
 
-int KontrollKnopf::getSBgFarbe() const // returns the select background color
+int CheckBox::getSBgFarbe() const // returns the select background color
 {
     return sBgF;
 }
 
-int KontrollKnopf::getKBgFarbe() const // returns the click background color
+int CheckBox::getKBgFarbe() const // returns the click background color
 {
     return kBgF;
 }
 
-Image* KontrollKnopf::getSBgImage() const // returns the select background image
+Image* CheckBox::getSBgImage() const // returns the select background image
 {
     return sBgB ? dynamic_cast<Image*>(sBgB->getThis()) : 0;
 }
 
-Image* KontrollKnopf::zSBgImage() const
+Image* CheckBox::zSBgImage() const
 {
     return sBgB;
 }
 
-Image* KontrollKnopf::getKBgImage() const // returns the click background image
+Image* CheckBox::getKBgImage() const // returns the click background image
 {
     return kBgB ? dynamic_cast<Image*>(kBgB->getThis()) : 0;
 }
 
-Image* KontrollKnopf::zKBgImage() const
+Image* CheckBox::zKBgImage() const
 {
     return kBgB;
 }
 
-AlphaFeld* KontrollKnopf::getSAlphaFeld() const // returns the select AlphaFeld
+AlphaField* CheckBox::getSAlphaField() const // returns the select AlphaField
 {
-    return sAf ? dynamic_cast<AlphaFeld*>(sAf->getThis()) : 0;
+    return sAf ? dynamic_cast<AlphaField*>(sAf->getThis()) : 0;
 }
 
-AlphaFeld* KontrollKnopf::zSAlphaFeld() const
+AlphaField* CheckBox::zSAlphaField() const
 {
     return sAf;
 }
 
-AlphaFeld* KontrollKnopf::getKAlphaFeld() const // returns the click AlphaFeld
+AlphaField* CheckBox::getKAlphaField() const // returns the click AlphaField
 {
     if (!kAf) return 0;
-    return dynamic_cast<AlphaFeld*>(kAf->getThis());
+    return dynamic_cast<AlphaField*>(kAf->getThis());
 }
 
-AlphaFeld* KontrollKnopf::zKAlphaFeld() const
+AlphaField* CheckBox::zKAlphaField() const
 {
     return kAf;
 }

Button.h

@@ -1,22 +1,22 @@
-#ifndef Knopf_H
-#define Knopf_H
+#ifndef Button_H
+#define Button_H
 
 #include "TextField.h"
 
 namespace Framework
 {
     class TextField;      //! TextField.h
-    class AlphaFeld;     //! AlphaField.h
+    class AlphaField;     //! AlphaField.h
     class Text;          //! Text.h
     class Font;       //! Font.h
     class Border;        //! Border.h
-    class LTDBDatei;     //! FileSystem.h
-    class Knopf;         //! from this file
-    class KontrollKnopf; //! from this file
+    class LTDBFile;     //! FileSystem.h
+    class Button;         //! from this file
+    class CheckBox; //! from this file
     class TextRenderer;
 
     //! A 2D GUI Framework drawing that renders a button that the user can press
-    class Knopf : public TextField
+    class Button : public TextField
     {
     public:
         class Style : public DrawableBackground::Style
@@ -46,17 +46,17 @@ namespace Framework
     private:
         int klickFarbe;
         Image* klickImage;
-        AlphaFeld* klickBuffer;
+        AlphaField* klickBuffer;
         int klickIndex;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
-        DLLEXPORT Knopf();
+        DLLEXPORT Button();
         //! Destructor
-        DLLEXPORT virtual ~Knopf();
+        DLLEXPORT virtual ~Button();
         //! Sets the color used as background when the button is pressed
         //! \param fc The color in A8R8G8B8 format
         DLLEXPORT void setKlickFarbe(int fc);
@@ -70,7 +70,7 @@ namespace Framework
         DLLEXPORT void setKlickImageZ(Image* bild);
         //! Sets a pointer to the color gradient used when the button is pressed
         //! \param af The new color gradient
-        DLLEXPORT void setKBZ(AlphaFeld* af);
+        DLLEXPORT void setKBZ(AlphaField* af);
         //! Sets the strength of the color gradient used when the button is
         //! pressed
         //! \param st The strength
@@ -80,7 +80,7 @@ namespace Framework
         DLLEXPORT void setKBFarbe(int fc);
         //! Processes mouse messages
         //! \param me The event triggered by the keyboard input
-        DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
+        DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
@@ -93,10 +93,10 @@ namespace Framework
         //! used when the button is pressed
         DLLEXPORT Image* zKlickImage() const;
         //! Returns the color gradient used when the button is pressed
-        DLLEXPORT AlphaFeld* getKB() const;
+        DLLEXPORT AlphaField* getKB() const;
         //! Returns the color gradient without increased reference counter
         //! used when the button is pressed
-        DLLEXPORT AlphaFeld* zKB() const;
+        DLLEXPORT AlphaField* zKB() const;
         //! Returns the color of the color gradient in A8R8G8B8 format
         //! used when the button is pressed
         DLLEXPORT int getKBFarbe() const;
@@ -110,7 +110,7 @@ namespace Framework
 
     //! A 2D GUI Framework drawing that renders a selectable checkbox
     //! with label
-    class KontrollKnopf : public DrawableBackground
+    class CheckBox : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -166,8 +166,8 @@ namespace Framework
         int kBgF;
         Image* sBgB;
         Image* kBgB;
-        AlphaFeld* sAf;
-        AlphaFeld* kAf;
+        AlphaField* sAf;
+        AlphaField* kAf;
         Image* kasten;
         Image* sKasten;
         TextRenderer* textRd;
@@ -175,13 +175,13 @@ namespace Framework
         int sGr;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
-        DLLEXPORT KontrollKnopf();
+        DLLEXPORT CheckBox();
         //! Destructor
-        DLLEXPORT virtual ~KontrollKnopf();
+        DLLEXPORT virtual ~CheckBox();
         //! Sets a pointer to the label text
         //! \param txt The text
         DLLEXPORT void setTextZ(Text* txt);
@@ -232,7 +232,7 @@ namespace Framework
         DLLEXPORT void setKBgImage(Image* b);
         //! Sets a pointer to the color gradient used while the checkbox
         //! is selected \param af The color gradient
-        DLLEXPORT void setSAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setSAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient used while the checkbox
         //! is selected \param f The color in A8R8G8B8 format
         DLLEXPORT void setSAFFarbe(int f);
@@ -241,7 +241,7 @@ namespace Framework
         DLLEXPORT void setSAFStrength(int st);
         //! Sets a pointer to the color gradient used while the checkbox
         //! is being clicked \param af The color gradient
-        DLLEXPORT void setKAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setKAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient used while the checkbox
         //! is being clicked \param f The color in A8R8G8B8 format
         DLLEXPORT void setKAFFarbe(int f);
@@ -252,7 +252,7 @@ namespace Framework
         //! kasten.gif is drawn when the checkbox is not selected.
         //! skasten.gif is drawn when the checkbox is selected.
         //! \param zDat The LTDB file
-        DLLEXPORT void loadData(LTDBDatei* zDat);
+        DLLEXPORT void loadData(LTDBFile* zDat);
         //! Loads images "kasten.gif" and "skasten.gif" from an LTDB file.
         //! kasten.gif is drawn when the checkbox is not selected.
         //! skasten.gif is drawn when the checkbox is selected.
@@ -295,15 +295,15 @@ namespace Framework
         //! used while the checkbox is being clicked
         DLLEXPORT Image* zKBgImage() const;
         //! Returns the color gradient used while the checkbox is selected
-        DLLEXPORT AlphaFeld* getSAlphaFeld() const;
+        DLLEXPORT AlphaField* getSAlphaField() const;
         //! Returns the color gradient without increased reference counter
         //! used while the checkbox is selected
-        DLLEXPORT AlphaFeld* zSAlphaFeld() const;
+        DLLEXPORT AlphaField* zSAlphaField() const;
         //! Returns the color gradient used while the checkbox is being clicked
-        DLLEXPORT AlphaFeld* getKAlphaFeld() const;
+        DLLEXPORT AlphaField* getKAlphaField() const;
         //! Returns the color gradient without increased reference counter
         //! used while the checkbox is being clicked
-        DLLEXPORT AlphaFeld* zKAlphaFeld() const;
+        DLLEXPORT AlphaField* zKAlphaField() const;
     };
 } // namespace Framework
 

Camera2D.cpp

@@ -6,7 +6,7 @@
 
 using namespace Framework;
 
-Kamera2D::Kamera2D()
+Camera2D::Camera2D()
     : DrawableBackground()
 {
     setStyle(Style::Sichtbar);
@@ -14,28 +14,28 @@ Kamera2D::Kamera2D()
     rotation = 0;
     matrix = Mat3<float>::identity();
     zoom = 1;
-    tickWelt = 0;
+    tickWorld = 0;
     name = new Text("");
 }
 
-Kamera2D::~Kamera2D()
+Camera2D::~Camera2D()
 {
     if (welt) welt->release();
     name->release();
 }
 
-void Kamera2D::setName(const char* name)
+void Camera2D::setName(const char* name)
 {
     this->name->setText(name);
 }
 
-void Kamera2D::setName(Text* name)
+void Camera2D::setName(Text* name)
 {
     this->name->setText(*name);
     name->release();
 }
 
-void Kamera2D::lookAtWorldPos(float x, float y)
+void Camera2D::lookAtWorldPos(float x, float y)
 {
     rend |= wPos != Vertex(x, y);
     wPos.x = x;
@@ -51,44 +51,44 @@ void Kamera2D::lookAtWorldPos(float x, float y)
     }
 }
 
-void Kamera2D::lookAtWorldPos(Vertex pos)
+void Camera2D::lookAtWorldPos(Vertex pos)
 {
     lookAtWorldPos(pos.x, pos.y);
 }
 
-void Kamera2D::lookAtWorldArea(float width, float height)
+void Camera2D::lookAtWorldArea(float width, float height)
 {
     zoom = (float)getBreite() / width;
     // TODO have two scaling factors
 }
 
-void Kamera2D::setDrehung(float rotation)
+void Camera2D::setDrehung(float rotation)
 {
     rend |= this->rotation != rotation;
     this->rotation = rotation;
 }
 
-void Kamera2D::setZoom(float zoom)
+void Camera2D::setZoom(float zoom)
 {
     rend |= this->zoom != zoom;
     this->zoom = zoom;
 }
 
-void Kamera2D::setWelt(Welt2D* welt, bool tick)
+void Camera2D::setWorld(World2D* welt, bool tick)
 {
     if (this->welt) this->welt->release();
     this->welt = welt;
-    tickWelt = tick;
+    tickWorld = tick;
     rend = 1;
 }
 
-bool Kamera2D::tick(double time)
+bool Camera2D::tick(double time)
 {
-    if (welt && tickWelt) rend |= welt->tick(time);
+    if (welt && tickWorld) rend |= welt->tick(time);
     return DrawableBackground::tick(time);
 }
 
-void Kamera2D::render(Image& zRObj)
+void Camera2D::render(Image& zRObj)
 {
     if (hatStyleNicht(Style::Sichtbar)) return;
     DrawableBackground::render(zRObj);
@@ -107,7 +107,7 @@ void Kamera2D::render(Image& zRObj)
     unlockDrawable();
 }
 
-Vertex Kamera2D::getWorldCoordinates(Punkt screenPos)
+Vertex Camera2D::getWorldCoordinates(Punkt screenPos)
 {
     Vertex wKoord
         = (Mat3<float>::translation(wPos) * Mat3<float>::scaling(1 / zoom)
@@ -129,45 +129,45 @@ Vertex Kamera2D::getWorldCoordinates(Punkt screenPos)
     return wKoord;
 }
 
-Vertex Kamera2D::getWorldDirection(Vertex dir)
+Vertex Camera2D::getWorldDirection(Vertex dir)
 {
     return Vertex(dir.x, dir.y).rotation(-rotation) * (1 / zoom);
 }
 
-Vertex Kamera2D::getWorldPosition()
+Vertex Camera2D::getWorldPosition()
 {
     return wPos;
 }
 
-float Kamera2D::getRotation()
+float Camera2D::getRotation()
 {
     return rotation;
 }
 
-float Kamera2D::getZoom()
+float Camera2D::getZoom()
 {
     return zoom;
 }
 
-const Mat3<float>& Kamera2D::getMatrix()
+const Mat3<float>& Camera2D::getMatrix()
 {
     return matrix;
 }
 
-Text* Kamera2D::getName()
+Text* Camera2D::getName()
 {
     return dynamic_cast<Text*>(name->getThis());
 }
 
-Text* Kamera2D::zName()
+Text* Camera2D::zName()
 {
     return name;
 }
 
-bool TestKamera2D::tick(double time)
+bool TestCamera2D::tick(double time)
 {
     bool ret = rend;
-    rend = Kamera2D::tick(time);
+    rend = Camera2D::tick(time);
     if (getTastenStand('q'))
     {
         rotation += (float)(time * 0.5);

Camera2D.h

@@ -6,14 +6,14 @@
 
 namespace Framework
 {
-    class Welt2D;
+    class World2D;
     class Object2D;
 
-    class Kamera2D : public DrawableBackground
+    class Camera2D : public DrawableBackground
     {
     protected:
-        Welt2D* welt;
-        bool tickWelt;
+        World2D* welt;
+        bool tickWorld;
         Vertex wPos;
         float rotation;
         float zoom;
@@ -21,8 +21,8 @@ namespace Framework
         Text* name;
 
     public:
-        __declspec(dllexport) Kamera2D();
-        __declspec(dllexport) virtual ~Kamera2D();
+        __declspec(dllexport) Camera2D();
+        __declspec(dllexport) virtual ~Camera2D();
         __declspec(dllexport) void setName(const char* name);
         __declspec(dllexport) void setName(Text* name);
         __declspec(dllexport) void lookAtWorldPos(Vertex pos);
@@ -30,7 +30,7 @@ namespace Framework
         __declspec(dllexport) void lookAtWorldArea(float width, float height);
         __declspec(dllexport) void setDrehung(float rotation);
         __declspec(dllexport) void setZoom(float zoom);
-        __declspec(dllexport) void setWelt(Welt2D* welt, bool tick);
+        __declspec(dllexport) void setWorld(World2D* welt, bool tick);
         __declspec(dllexport) bool tick(double time);
         __declspec(dllexport) void render(Image& zRObj);
         __declspec(dllexport) Vertex getWorldCoordinates(Punkt screenPos);
@@ -43,7 +43,7 @@ namespace Framework
         __declspec(dllexport) Text* zName();
     };
 
-    class TestKamera2D : public Kamera2D
+    class TestCamera2D : public Camera2D
     {
     public:
         __declspec(dllexport) bool tick(double time);

Camera3D.cpp

@@ -11,9 +11,9 @@
 
 using namespace Framework;
 
-// Contents of the Kam3D class
+// Contents of the Cam3D class
 // Constructor
-Kam3D::Kam3D()
+Cam3D::Cam3D()
     : ReferenceCounter(),
       rend(0)
 {
@@ -40,7 +40,7 @@ Kam3D::Kam3D()
 }
 
 // Destructor
-Kam3D::~Kam3D()
+Cam3D::~Cam3D()
 {
     if (welt) welt->release();
 }
@@ -48,7 +48,7 @@ Kam3D::~Kam3D()
 // private
 
 // Updates the view and projection matrices
-void Kam3D::updateMatrix()
+void Cam3D::updateMatrix()
 {
     view = view.rotationX(-rotX) * view.rotationY(-rotY) * view.rotationZ(-rotZ)
          * view.translation(Vec3<float>(-pos.x, -pos.y, -pos.z));
@@ -57,7 +57,7 @@ void Kam3D::updateMatrix()
 }
 
 // Sets the position of the camera in the 3D world
-void Kam3D::setPosition(Vec3<float> pos)
+void Cam3D::setPosition(Vec3<float> pos)
 {
     this->pos = pos;
     rend = 1;
@@ -66,7 +66,7 @@ void Kam3D::setPosition(Vec3<float> pos)
 
 // Zooms in by moving the camera closer to the view target
 //  val: The length of the distance the camera should move
-void Kam3D::scrollIn(float val)
+void Cam3D::scrollIn(float val)
 {
     Vec3<float> n(0, 0, 1);
     Mat4<float> tmp
@@ -79,7 +79,7 @@ void Kam3D::scrollIn(float val)
 
 // Zooms out by moving the camera away from the view target
 //  val: The length of the distance the camera should move
-void Kam3D::scrollOut(float val)
+void Cam3D::scrollOut(float val)
 {
     Vec3<float> n(0, 0, 1);
     Mat4<float> tmp
@@ -92,7 +92,7 @@ void Kam3D::scrollOut(float val)
 
 // Aligns the camera so that it points exactly at a specific point
 //  ziel: The point the camera should point at
-void Kam3D::setAusrichtung(Vec3<float> ziel)
+void Cam3D::setAusrichtung(Vec3<float> ziel)
 {
     Vec3<float> target = (ziel - pos).normalize();
     if (Vec3<float>(0, target.y, target.z).getLength() == 0)
@@ -114,7 +114,7 @@ void Kam3D::setAusrichtung(Vec3<float> ziel)
 
 //! Sets the rotation of the camera around each axis
 //! \param rotation The rotation around each axis
-void Kam3D::setRotation(Vec3<float> rotation)
+void Cam3D::setRotation(Vec3<float> rotation)
 {
     rotX = rotation.x;
     rotY = rotation.y;
@@ -125,7 +125,7 @@ void Kam3D::setRotation(Vec3<float> rotation)
 
 // Sets the position of the image on the screen
 //  p: A point with x and y coordinates in pixels
-void Kam3D::setScreenPosition(Punkt p)
+void Cam3D::setScreenPosition(Punkt p)
 {
     viewport.x = (float)p.x;
     viewport.y = (float)p.y;
@@ -134,7 +134,7 @@ void Kam3D::setScreenPosition(Punkt p)
 // Sets the position of the image on the screen
 //  x: The x coordinate in pixels
 //  y: The y coordinate in pixels
-void Kam3D::setScreenPosition(int x, int y)
+void Cam3D::setScreenPosition(int x, int y)
 {
     viewport.x = (float)x;
     viewport.y = (float)y;
@@ -142,7 +142,7 @@ void Kam3D::setScreenPosition(int x, int y)
 
 // Sets the size of the image on the screen
 //  p: A point, with x as width and y as height in pixels
-void Kam3D::setScreenSize(Punkt p)
+void Cam3D::setScreenSize(Punkt p)
 {
     viewport.width = (float)p.x;
     viewport.height = (float)p.y;
@@ -152,7 +152,7 @@ void Kam3D::setScreenSize(Punkt p)
 // Sets the size of the image on the screen
 //  br: The width in pixels
 //  hoe: The height in pixels
-void Kam3D::setScreenSize(int br, int hoe)
+void Cam3D::setScreenSize(int br, int hoe)
 {
     viewport.width = (float)br;
     viewport.height = (float)hoe;
@@ -161,7 +161,7 @@ void Kam3D::setScreenSize(int br, int hoe)
 
 // Sets the world to be drawn
 //  w: The world
-void Kam3D::setWelt(Welt3D* w)
+void Cam3D::setWorld(World3D* w)
 {
     if (welt) welt->release();
     welt = w;
@@ -170,7 +170,7 @@ void Kam3D::setWelt(Welt3D* w)
 // Sets the style of the camera
 //  style: The new style consisting of the flags from the associated Style
 //  class
-void Kam3D::setStyle(__int64 style)
+void Cam3D::setStyle(__int64 style)
 {
     this->style = style;
 }
@@ -179,7 +179,7 @@ void Kam3D::setStyle(__int64 style)
 //  style: All Style Flags to be changed
 //  add_remove: 1 if the style should be added. 0 if the style
 //  should be removed
-void Kam3D::setStyle(__int64 style, bool add_remove)
+void Cam3D::setStyle(__int64 style, bool add_remove)
 {
     if (add_remove)
         this->style |= style;
@@ -189,20 +189,20 @@ void Kam3D::setStyle(__int64 style, bool add_remove)
 
 // Adds style flags
 //  style: The style to be added
-void Kam3D::addStyle(__int64 style)
+void Cam3D::addStyle(__int64 style)
 {
     this->style |= style;
 }
 
 // Removes style flags
 //  style: The style to be removed
-void Kam3D::removeStyle(__int64 style)
+void Cam3D::removeStyle(__int64 style)
 {
     this->style &= ~style;
 }
 
 //! Set the movement speed per second if the camera has style Movable
-void Kam3D::setMovementSpeed(float speed)
+void Cam3D::setMovementSpeed(float speed)
 {
     this->speed = speed;
 }
@@ -211,7 +211,7 @@ void Kam3D::setMovementSpeed(float speed)
 //  tickval: The time in seconds since the last call of the function
 //  has passed return: true, if the image needs to be redrawn,
 //  false otherwise.
-bool Kam3D::tick(double tv)
+bool Cam3D::tick(double tv)
 {
     bool ret = rend;
     rend = 0;
@@ -288,14 +288,14 @@ bool Kam3D::tick(double tv)
 
 // Processes a mouse event
 //  me: The mouse event to be processed
-void Kam3D::doMausEreignis(MausEreignis& me)
+void Cam3D::doMouseEvent(MouseEvent& me)
 {
     if (me.verarbeitet) return;
     if (me.mx > viewport.x && me.my > viewport.y
         && me.mx < viewport.x + viewport.width
         && me.my < viewport.y + viewport.height)
     {
-        MausEreignis3D me3d;
+        MouseEvent3D me3d;
         me3d.id = me.id;
         me3d.verarbeitet = me.verarbeitet;
         Vec3<float> mausP
@@ -315,12 +315,12 @@ void Kam3D::doMausEreignis(MausEreignis& me)
 
 // Processes a keyboard event
 //  te: The keyboard event to be processed
-void Kam3D::doTastaturEreignis(TastaturEreignis& te) {}
+void Cam3D::doKeyboardEvent(KeyboardEvent& te) {}
 
 // Returns whether certain styles are set
 //  style: The styles to be checked
 //  return: 1, if all styles in style are set
-bool Kam3D::hatStyle(__int64 style) const
+bool Cam3D::hatStyle(__int64 style) const
 {
     return (this->style | style) == this->style;
 }
@@ -328,26 +328,26 @@ bool Kam3D::hatStyle(__int64 style) const
 // Returns whether certain styles are not set
 //  style: The styles to be checked
 //  return: 1, if all styles in style are not set
-bool Kam3D::hatStyleNicht(__int64 style) const
+bool Cam3D::hatStyleNicht(__int64 style) const
 {
     return (this->style | style) != this->style;
 }
 
 // Returns a pointer to the viewport
-const ViewPort* Kam3D::zViewPort() const
+const ViewPort* Cam3D::zViewPort() const
 {
     return &viewport;
 }
 
 // Returns the position of the camera in the world
-const Vec3<float>& Kam3D::getWorldPosition() const
+const Vec3<float>& Cam3D::getWorldPosition() const
 {
     return pos;
 }
 
 // Returns the position in the world
 //  screen: the screen position to be translated
-const Vec3<float> Kam3D::getWorldPosition(Punkt screen) const
+const Vec3<float> Cam3D::getWorldPosition(Punkt screen) const
 {
     Vec3<float> point = Vec3<float>(
         (screen.x - viewport.x) / (0.5f * viewport.width) - 1,
@@ -363,7 +363,7 @@ const Vec3<float> Kam3D::getWorldPosition(Punkt screen) const
 
 // Returns the direction of the camera in the world
 //  screen: the screen position to be translated
-const Vec3<float> Kam3D::getWorldDirection(Punkt screen) const
+const Vec3<float> Cam3D::getWorldDirection(Punkt screen) const
 {
     Vec3<float> point = Vec3<float>(
         (screen.x - viewport.x) / (0.5f * viewport.width) - 1,
@@ -383,43 +383,43 @@ const Vec3<float> Kam3D::getWorldDirection(Punkt screen) const
 }
 
 // Returns the projection matrix of the camera
-const Mat4<float>& Kam3D::getProjectionMatrix() const
+const Mat4<float>& Cam3D::getProjectionMatrix() const
 {
     return proj;
 }
 
 // Returns the view matrix of the camera
-const Mat4<float>& Kam3D::getViewMatrix() const
+const Mat4<float>& Cam3D::getViewMatrix() const
 {
     return view;
 }
 
 //! Returns the rotation around each axis
-const Vec3<float> Kam3D::getRotation() const
+const Vec3<float> Cam3D::getRotation() const
 {
     return {rotX, rotY, rotZ};
 }
 
 //! Returns the position of the camera on the screen
-const Punkt Kam3D::getScreenPos() const
+const Punkt Cam3D::getScreenPos() const
 {
     return Punkt((int)viewport.x, (int)viewport.y);
 }
 
 //! Returns the size of the camera on the screen
-const Punkt Kam3D::getScreenSize() const
+const Punkt Cam3D::getScreenSize() const
 {
     return Punkt((int)viewport.width, (int)viewport.height);
 }
 
 // Returns the world
-Welt3D* Kam3D::getWelt() const
+World3D* Cam3D::getWorld() const
 {
-    return welt ? dynamic_cast<Welt3D*>(welt->getThis()) : 0;
+    return welt ? dynamic_cast<World3D*>(welt->getThis()) : 0;
 }
 
 // Returns the world
-Welt3D* Kam3D::zWelt() const
+World3D* Cam3D::zWorld() const
 {
     return welt;
 }

Camera3D.h

@@ -10,9 +10,9 @@ struct D3D11_VIEWPORT;
 
 namespace Framework
 {
-    struct MausEreignis; //! MouseEvent.h
+    struct MouseEvent; //! MouseEvent.h
     class Render3D;      //! Render3D.h
-    class Welt3D;        //! World3D.h
+    class World3D;        //! World3D.h
 
     struct ViewPort
     {
@@ -26,7 +26,7 @@ namespace Framework
 
     //! A 3D camera that draws a section of a 3D world into a specific
     //! area of the screen
-    class Kam3D : public virtual Framework::ReferenceCounter
+    class Cam3D : public virtual Framework::ReferenceCounter
     {
     public:
         class Style
@@ -54,7 +54,7 @@ namespace Framework
         float rotZ;
 
         ViewPort viewport;
-        Welt3D* welt;
+        World3D* welt;
         __int64 style;
         float speed;
 
@@ -63,9 +63,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT Kam3D();
+        DLLEXPORT Cam3D();
         //! Destructor
-        DLLEXPORT ~Kam3D();
+        DLLEXPORT ~Cam3D();
         //! Sets the position of the camera in the 3D world
         DLLEXPORT void setPosition(Vec3<float> pos);
         //! Zooms in by moving the camera slightly towards the target
@@ -96,7 +96,7 @@ namespace Framework
         DLLEXPORT void setScreenSize(int br, int hi);
         //! Sets the world to be drawn
         //! \param w The world
-        DLLEXPORT void setWelt(Welt3D* w);
+        DLLEXPORT void setWorld(World3D* w);
         //! Sets the style of the camera
         //! \param style The new style consisting of flags from the
         //! associated Style class
@@ -120,10 +120,10 @@ namespace Framework
         DLLEXPORT virtual bool tick(double tv);
         //! Processes a mouse event
         //! \param me The mouse event to process
-        DLLEXPORT virtual void doMausEreignis(MausEreignis& me);
+        DLLEXPORT virtual void doMouseEvent(MouseEvent& me);
         //! Processes a keyboard event
         //! \param te The keyboard event to process
-        DLLEXPORT virtual void doTastaturEreignis(TastaturEreignis& te);
+        DLLEXPORT virtual void doKeyboardEvent(KeyboardEvent& te);
         //! Returns whether specific styles are set
         //! \param style The styles to check
         //! \return 1 if all styles in style are set
@@ -153,8 +153,8 @@ namespace Framework
         //! Returns the size of the camera on the screen
         DLLEXPORT const Punkt getScreenSize() const;
         //! Returns the world
-        DLLEXPORT Welt3D* getWelt() const;
+        DLLEXPORT World3D* getWorld() const;
         //! Returns the world without increased reference counter
-        DLLEXPORT Welt3D* zWelt() const;
+        DLLEXPORT World3D* zWorld() const;
     };
 } // namespace Framework

Class.h

@@ -9,25 +9,25 @@
 
 namespace Framework
 {
-    class Klasse : public Typ
+    class Class : public Type
     {
     private:
         Text name;
-        std::vector<Funktion> funktions;
-        std::vector<Feld> felder;
+        std::vector<Function> funktions;
+        std::vector<Field> felder;
 
     public:
-        Klasse(Text name)
+        Class(Text name)
         {
             this->name = name;
         }
 
-        void addFunction(Funktion f)
+        void addFunction(Function f)
         {
             this->funktions.push_back(f);
         }
 
-        void addFeld(Feld f)
+        void addField(Field f)
         {
             this->felder.push_back(f);
         }

Console.cpp

@@ -1,4 +1,4 @@
-#include "Console.h"
+#include "Console.h"
 
 #include <iostream>
 
@@ -668,9 +668,9 @@ void Framework::InputLine::applyAutocompletion()
     Text* cmd = input.getTeilText(0, cursorPos);
     parseCommand(*cmd, params, lastArgFinished);
     cmd->release();
-    bool paramsStarted = params.getEintragAnzahl() > 1 || lastArgFinished;
+    bool paramsStarted = params.getEntryCount() > 1 || lastArgFinished;
     Text* name;
-    if (params.getEintragAnzahl() > 0)
+    if (params.getEntryCount() > 0)
     {
         name = params.get(0);
         params.remove(0);
@@ -710,14 +710,14 @@ void Framework::InputLine::applyAutocompletion()
     {
         this->suggestions->addItem(*suggestion);
     }
-    if (this->suggestions->getItems().getEintragAnzahl() > 0)
+    if (this->suggestions->getItems().getEntryCount() > 0)
     {
         bool commonChar = true;
         for (int i
              = lastArgFinished
                  ? 0
-                 : (params.getEintragAnzahl() > 0
-                         ? params.z(params.getEintragAnzahl() - 1)->getLength()
+                 : (params.getEntryCount() > 0
+                         ? params.z(params.getEntryCount() - 1)->getLength()
                          : name->getLength());
              true;
              i++)
@@ -728,7 +728,7 @@ void Framework::InputLine::applyAutocompletion()
                 break;
             }
             for (int j = 1;
-                 j < this->suggestions->getItems().getEintragAnzahl();
+                 j < this->suggestions->getItems().getEntryCount();
                  j++)
             {
                 if (i >= this->suggestions->getItems().z(j)->getLength())
@@ -753,7 +753,7 @@ void Framework::InputLine::applyAutocompletion()
         }
     }
     name->release();
-    if (this->suggestions->getItems().getEintragAnzahl() <= 1)
+    if (this->suggestions->getItems().getEntryCount() <= 1)
     {
         this->suggestions->release();
         this->suggestions = 0;
@@ -773,7 +773,7 @@ bool Framework::InputLine::executeCommand(Text command)
     }
     cmd->release();
     Text* name;
-    if (params.getEintragAnzahl() > 0)
+    if (params.getEntryCount() > 0)
     {
         name = params.get(0);
         params.remove(0);
@@ -874,9 +874,9 @@ int Framework::ConsoleListView::getUsedColumns() const
     {
         columns = maxColumns;
     }
-    if (columns > items.getEintragAnzahl())
+    if (columns > items.getEntryCount())
     {
-        columns = items.getEintragAnzahl();
+        columns = items.getEntryCount();
     }
     return columns;
 }
@@ -892,8 +892,8 @@ int Framework::ConsoleListView::getNeededLines() const
     {
         columns = maxColumns;
     }
-    int lines = items.getEintragAnzahl() / columns;
-    if (items.getEintragAnzahl() % columns != 0)
+    int lines = items.getEntryCount() / columns;
+    if (items.getEntryCount() % columns != 0)
     {
         lines++;
     }
@@ -990,7 +990,7 @@ int Framework::ConsoleListView::print() const
     int printetLines = 0;
     int currentColumn = 0;
     std::cout << "\33[0K"; // clear current line
-    for (int i = columns * lines; i < items.getEintragAnzahl(); i++)
+    for (int i = columns * lines; i < items.getEntryCount(); i++)
     {
         if (i >= columns * (lines + maxVisibleLines))
         {

Cube.cpp

@@ -158,32 +158,32 @@ Cube::Cube(float size, GraphicsApi* zApi)
         model->addPolygon(p);
     }
 
-    textur = new Model3DTextur();
+    textur = new Model3DTexture();
 }
 
 // Sets the texture of the cube so that it is the same on all sides
 //  textur: the texture
-void Cube::setTextur(Textur* textur)
+void Cube::setTexture(Texture* textur)
 {
-    this->textur->setPolygonTextur(
-        LINKS, dynamic_cast<Textur*>(textur->getThis()));
-    this->textur->setPolygonTextur(
-        OBEN, dynamic_cast<Textur*>(textur->getThis()));
-    this->textur->setPolygonTextur(
-        RECHTS, dynamic_cast<Textur*>(textur->getThis()));
-    this->textur->setPolygonTextur(
-        UNTEN, dynamic_cast<Textur*>(textur->getThis()));
-    this->textur->setPolygonTextur(
-        VORNE, dynamic_cast<Textur*>(textur->getThis()));
-    this->textur->setPolygonTextur(HINTEN, textur);
+    this->textur->setPolygonTexture(
+        LINKS, dynamic_cast<Texture*>(textur->getThis()));
+    this->textur->setPolygonTexture(
+        OBEN, dynamic_cast<Texture*>(textur->getThis()));
+    this->textur->setPolygonTexture(
+        RECHTS, dynamic_cast<Texture*>(textur->getThis()));
+    this->textur->setPolygonTexture(
+        UNTEN, dynamic_cast<Texture*>(textur->getThis()));
+    this->textur->setPolygonTexture(
+        VORNE, dynamic_cast<Texture*>(textur->getThis()));
+    this->textur->setPolygonTexture(HINTEN, textur);
     rend = 1;
 }
 
 // Sets the texture of a specific side of the cube
 //  textur:  the texture
 //  s: The side to be set
-void Cube::setTextur(Textur* textur, CubeSeite s)
+void Cube::setTexture(Texture* textur, CubeSeite s)
 {
-    this->textur->setPolygonTextur(s, textur);
+    this->textur->setPolygonTexture(s, textur);
     rend = 1;
 }

Cube.h

@@ -4,7 +4,7 @@
 
 namespace Framework
 {
-    class Textur;
+    class Texture;
     class GraphicsApi;
 
     enum CubeSeite
@@ -26,10 +26,10 @@ namespace Framework
         DLLEXPORT Cube(float size, GraphicsApi* zApi);
         //! Sets the texture of the cube so that it is the same on all sides
         //! \param textur The texture
-        DLLEXPORT void setTextur(Textur* textur);
+        DLLEXPORT void setTexture(Texture* textur);
         //! Sets the texture of a specific side of the cube
         //! \param textur The texture
         //! \param s The side to set
-        DLLEXPORT void setTextur(Textur* textur, CubeSeite s);
+        DLLEXPORT void setTexture(Texture* textur, CubeSeite s);
     };
 } // namespace Framework

DLLRegister.cpp

@@ -2,22 +2,22 @@
 
 using namespace Framework;
 
-// Content of the DLLDateien class from DLLDateien.h
+// Content of the DLLFiles class from DLLFiles.h
 // Constructor
 DLLRegister::DLLRegister()
     : ReferenceCounter()
 {
-    dlls = new Array<DLLDatei*>();
+    dlls = new Array<DLLFile*>();
 }
 
 // Destructor
 DLLRegister::~DLLRegister()
 {
     cs.lock();
-    int anz = dlls->getEintragAnzahl();
+    int anz = dlls->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
-        DLLDatei* tmp = dlls->get(i);
+        DLLFile* tmp = dlls->get(i);
         if (tmp)
         {
             tmp->name->release();
@@ -35,10 +35,10 @@ DLLRegister::~DLLRegister()
 HINSTANCE DLLRegister::ladeDLL(const char* name, const char* pfad)
 {
     cs.lock();
-    int anz = dlls->getEintragAnzahl();
+    int anz = dlls->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
-        DLLDatei* tmp = dlls->get(i);
+        DLLFile* tmp = dlls->get(i);
         if (tmp && tmp->name->istGleich(name))
         {
             tmp->ref++;
@@ -52,7 +52,7 @@ HINSTANCE DLLRegister::ladeDLL(const char* name, const char* pfad)
         cs.unlock();
         return 0;
     }
-    DLLDatei* dll = new DLLDatei();
+    DLLFile* dll = new DLLFile();
     dll->name = new Text(name);
     dll->handle = h;
     dll->ref = 1;
@@ -64,10 +64,10 @@ HINSTANCE DLLRegister::ladeDLL(const char* name, const char* pfad)
 void DLLRegister::releaseDLL(const char* name)
 {
     cs.lock();
-    int anz = dlls->getEintragAnzahl();
+    int anz = dlls->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
-        DLLDatei* tmp = dlls->get(i);
+        DLLFile* tmp = dlls->get(i);
         if (tmp && tmp->name->istGleich(name))
         {
             tmp->ref--;

DLLRegister.h

@@ -6,7 +6,7 @@
 
 namespace Framework
 {
-    struct DLLDatei
+    struct DLLFile
     {
         Text* name;
         HINSTANCE handle;
@@ -16,7 +16,7 @@ namespace Framework
     class DLLRegister : public virtual ReferenceCounter
     {
     private:
-        Array<DLLDatei*>* dlls;
+        Array<DLLFile*>* dlls;
         Critical cs;
 
     public:

DX11GraphicsApi.cpp

@@ -20,7 +20,7 @@
 
 using namespace Framework;
 
-struct TexturEffect
+struct TextureEffect
 {
     bool enabled;
     float percentage;
@@ -31,7 +31,7 @@ DirectX11::DirectX11()
       d3d11Device(0),
       d3d11Context(0),
       d3d11SpawChain(0),
-      uiTextur(0),
+      uiTexture(0),
       vertexShader(0),
       pixelShader(0),
       sampleState(0),
@@ -43,10 +43,10 @@ DirectX11::DirectX11()
       blendStateAlphaBlend(0),
       vp(0),
       texturModel(0),
-      texturRegister(new TexturList()),
+      texturRegister(new TextureList()),
       texturRS(0),
       meshRS(0),
-      defaultTextur(0),
+      defaultTexture(0),
       diffuseLights(0),
       pointLights(0)
 {}
@@ -55,7 +55,7 @@ DirectX11::~DirectX11()
 {
     if (diffuseLights) diffuseLights->release();
     if (pointLights) pointLights->release();
-    if (defaultTextur) defaultTextur->release();
+    if (defaultTexture) defaultTexture->release();
     if (texturRS) texturRS->Release();
     if (meshRS) meshRS->Release();
     if (texturModel) texturModel->release();
@@ -65,10 +65,10 @@ DirectX11::~DirectX11()
         blendStateAlphaBlend->Release();
         blendStateAlphaBlend = NULL;
     }
-    if (uiTextur)
+    if (uiTexture)
     {
-        uiTextur->release();
-        uiTextur = NULL;
+        uiTexture->release();
+        uiTexture = NULL;
     }
     if (sampleState)
     {
@@ -488,12 +488,12 @@ void DirectX11::initialize(
     renderB->setAlpha3D(1);
     renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
 
-    uiTextur = createOrGetTextur("_f_Render_Image", renderB);
-    ((DX11Textur*)uiTextur)->setUseMips(0);
+    uiTexture = createOrGetTexture("_f_Render_Image", renderB);
+    ((DX11Texture*)uiTexture)->setUseMips(0);
 
-    texturModel = new TexturModel(this, "_framework_gui_");
+    texturModel = new TextureModel(this, "_framework_gui_");
     texturModel->setSize(this->backBufferSize);
-    texturModel->setTextur(dynamic_cast<Textur*>(uiTextur->getThis()));
+    texturModel->setTexture(dynamic_cast<Texture*>(uiTexture->getThis()));
 
     D3D11_BLEND_DESC blendState;
     ZeroMemory(&blendState, sizeof(D3D11_BLEND_DESC));
@@ -547,7 +547,7 @@ void DirectX11::initialize(
 
     Image* b = new Image();
     b->neuImage(10, 10, 0xFFFFFFFF);
-    defaultTextur = createOrGetTextur("_default_textur", b);
+    defaultTexture = createOrGetTexture("_default_textur", b);
 
     diffuseLights = new DX11StructuredBuffer(
         sizeof(DiffuseLight), d3d11Device, d3d11Context);
@@ -578,16 +578,16 @@ void DirectX11::update()
         meshRS = NULL;
     }
     texturRegister->leeren();
-    if (defaultTextur) defaultTextur = (Textur*)defaultTextur->release();
+    if (defaultTexture) defaultTexture = (Texture*)defaultTexture->release();
     if (blendStateAlphaBlend)
     {
         blendStateAlphaBlend->Release();
         blendStateAlphaBlend = NULL;
     }
-    if (uiTextur)
+    if (uiTexture)
     {
-        uiTextur->release();
-        uiTextur = NULL;
+        uiTexture->release();
+        uiTexture = NULL;
     }
     if (sampleState)
     {
@@ -653,7 +653,7 @@ void DirectX11::update()
 
 void DirectX11::beginFrame(bool fill2D, bool fill3D, int fillColor)
 {
-    if (fill2D) uiTextur->zImage()->setFarbe(fillColor);
+    if (fill2D) uiTexture->zImage()->setFarbe(fillColor);
     if (fill3D || true)
     {
         float color[4];
@@ -697,26 +697,26 @@ void DirectX11::renderObject(Model3D* zObj)
     ID3D11Buffer* vBuffer
         = ((DX11Buffer*)zObj->zModelData()->zDXVertexBuffer())->zBuffer();
     d3d11Context->IASetVertexBuffers(0, 1, &vBuffer, &es, &offset);
-    Model3DTextur* zTextur = zObj->zTextur();
+    Model3DTexture* zTexture = zObj->zTexture();
     int ind = 0;
     int current = 0;
-    if (zObj->zEffectTextur())
+    if (zObj->zEffectTexture())
     {
         ID3D11ShaderResourceView* v[1];
-        DX11Textur* zEffectTextur = (DX11Textur*)zObj->zEffectTextur();
-        if (zEffectTextur && zEffectTextur->brauchtUpdate())
-            zEffectTextur->updateTextur();
-        v[0] = *zEffectTextur;
+        DX11Texture* zEffectTexture = (DX11Texture*)zObj->zEffectTexture();
+        if (zEffectTexture && zEffectTexture->brauchtUpdate())
+            zEffectTexture->updateTextur();
+        v[0] = *zEffectTexture;
         d3d11Context->PSSetShaderResources(3, 1, v);
-        TexturEffect e = {1, zObj->getEffectPercentage()};
+        TextureEffect e = {1, zObj->getEffectPercentage()};
         if (pixelShader)
-            pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TexturEffect));
+            pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TextureEffect));
     }
     else
     {
-        TexturEffect e = {0, 0.f};
+        TextureEffect e = {0, 0.f};
         if (pixelShader)
-            pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TexturEffect));
+            pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TextureEffect));
     }
     DXGI_FORMAT f = DXGI_FORMAT_R32_UINT;
     if (zObj->zModelData()->zDXIndexBuffer()->getElementLength() == 2)
@@ -731,12 +731,12 @@ void DirectX11::renderObject(Model3D* zObj)
     {
         if (zObj->needRenderPolygon(ind))
         {
-            Textur* t = zTextur->zPolygonTextur(ind);
+            Texture* t = zTexture->zPolygonTexture(ind);
             if (t && t->brauchtUpdate()) t->updateTextur();
             if (t)
             {
                 ID3D11ShaderResourceView* v[3];
-                v[0] = *(DX11Textur*)t;
+                v[0] = *(DX11Texture*)t;
                 v[1] = *diffuseLights;
                 v[2] = *pointLights;
                 d3d11Context->PSSetShaderResources(0, 3, v);
@@ -746,7 +746,7 @@ void DirectX11::renderObject(Model3D* zObj)
             {
                 d3d11Context->RSSetState(meshRS);
                 ID3D11ShaderResourceView* v[3];
-                v[0] = *(DX11Textur*)defaultTextur;
+                v[0] = *(DX11Texture*)defaultTexture;
                 v[1] = *diffuseLights;
                 v[2] = *pointLights;
                 d3d11Context->PSSetShaderResources(0, 3, v);
@@ -790,7 +790,7 @@ bool DirectX11::isInFrustrum(
     return 1;
 }
 
-void DirectX11::renderKamera(Kam3D* zKamera)
+void DirectX11::renderKamera(Cam3D* zKamera)
 {
     d3d11Context->RSSetViewports(1, (D3D11_VIEWPORT*)zKamera->zViewPort());
 
@@ -837,7 +837,7 @@ void DirectX11::renderKamera(Kam3D* zKamera)
             (char*)viewAndProj, 1, sizeof(Mat4<float>) * 2);
     if (pixelShader)
         pixelShader->fuellConstBuffer((char*)&kamPos, 0, sizeof(float) * 3);
-    Welt3D* w = zKamera->zWelt();
+    World3D* w = zKamera->zWorld();
     w->lock();
     int lc[] = {w->getDiffuseLightCount(), w->getPointLightCount()};
     pixelShader->fuellConstBuffer((char*)lc, 2, sizeof(int) * 2);
@@ -861,12 +861,12 @@ void DirectX11::renderKamera(Kam3D* zKamera)
         }
     });
     maxDist++;
-    if (alphaModels.getEintragAnzahl())
+    if (alphaModels.getEntryCount())
     {
         int size = maxDist - minDist;
         int* index = new int[size];
         memset(index, 0, size * 4);
-        Model3D** sorted = new Model3D*[size * alphaModels.getEintragAnzahl()];
+        Model3D** sorted = new Model3D*[size * alphaModels.getEntryCount()];
         for (auto obj : alphaModels)
         {
             float dist;
@@ -874,7 +874,7 @@ void DirectX11::renderKamera(Kam3D* zKamera)
             if (isInFrustrum(obj->getPos(), obj->getRadius(), &dist))
             {
                 int pos = (int)dist - minDist;
-                sorted[pos * alphaModels.getEintragAnzahl() + index[pos]++]
+                sorted[pos * alphaModels.getEntryCount() + index[pos]++]
                     = obj;
             }
         }
@@ -882,7 +882,7 @@ void DirectX11::renderKamera(Kam3D* zKamera)
         {
             for (int j = 0; j < index[i]; j++)
             {
-                renderObject(sorted[i * alphaModels.getEintragAnzahl() + j]);
+                renderObject(sorted[i * alphaModels.getEntryCount() + j]);
             }
         }
         delete[] index;
@@ -891,10 +891,10 @@ void DirectX11::renderKamera(Kam3D* zKamera)
     w->unlock();
 }
 
-void DirectX11::renderKamera(Kam3D* zKamera, Textur* zTarget)
+void DirectX11::renderKamera(Cam3D* zKamera, Texture* zTarget)
 {
     ID3D11RenderTargetView* texturRtView;
-    DX11Textur* d11Textur = dynamic_cast<DX11Textur*>(zTarget);
+    DX11Texture* d11Textur = dynamic_cast<DX11Texture*>(zTarget);
     if (!d11Textur)
         throw "incompatible textur object was passed to renderKamera of "
               "DirectX11 GPU API";
@@ -959,7 +959,7 @@ void DirectX11::presentFrame()
     // Set the depth stencil state.
     d3d11Context->OMSetDepthStencilState(depthDisabledStencilState, 1);
 
-    uiTextur->updateTextur();
+    uiTexture->updateTextur();
 
     d3d11Context->RSSetViewports(1, vp);
 
@@ -992,25 +992,25 @@ void DirectX11::presentFrame()
 
 Image* DirectX11::zUIRenderImage() const
 {
-    return uiTextur->zImage();
+    return uiTexture->zImage();
 }
 
-Textur* DirectX11::createOrGetTextur(const char* name, Image* b)
+Texture* DirectX11::createOrGetTexture(const char* name, Image* b)
 {
     if (!d3d11Device)
     {
         if (b) b->release();
         return 0;
     }
-    if (texturRegister->hatTextur(name))
+    if (texturRegister->hasTexture(name))
     {
-        Textur* ret = texturRegister->getTextur(name);
+        Texture* ret = texturRegister->getTexture(name);
         if (b) ret->setImageZ(b);
         return ret;
     }
-    Textur* ret = new DX11Textur(d3d11Device, d3d11Context);
+    Texture* ret = new DX11Texture(d3d11Device, d3d11Context);
     if (b) ret->setImageZ(b);
-    texturRegister->addTextur(dynamic_cast<Textur*>(ret->getThis()), name);
+    texturRegister->addTexture(dynamic_cast<Texture*>(ret->getThis()), name);
     return ret;
 }
 
@@ -1201,12 +1201,12 @@ DX11PixelShader* DirectX11::initializePixelShader(
     pixelShader->erstelleConstBuffer(
         sizeof(int) * 2, pixelShader->getFirstUninitializedBufferIndex());
     pixelShader->erstelleConstBuffer(
-        sizeof(TexturEffect), pixelShader->getFirstUninitializedBufferIndex());
+        sizeof(TextureEffect), pixelShader->getFirstUninitializedBufferIndex());
     // TODO: Remove Following Test Code
     int lc[] = {0, 0};
     pixelShader->fuellConstBuffer((char*)lc, 2, sizeof(int) * 2);
-    TexturEffect e = {0, 0.f};
-    pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TexturEffect));
+    TextureEffect e = {0, 0.f};
+    pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TextureEffect));
     return pixelShader;
 }
 

DX12GraphicsApi.cpp

@@ -47,8 +47,8 @@ DirectX12::DirectX12()
       signature(0),
       pipeline(0),
       texturModel(0),
-      uiTextur(0),
-      texturRegister(new TexturList()),
+      uiTexture(0),
+      texturRegister(new TextureList()),
       vertexShader(0),
       pixelShader(0)
 {
@@ -79,7 +79,7 @@ DirectX12::~DirectX12()
     if (vertexShader) vertexShader->release();
     if (pixelShader) pixelShader->release();
     texturRegister->release();
-    if (uiTextur) uiTextur->release();
+    if (uiTexture) uiTexture->release();
     if (texturModel) texturModel->release();
     if (pipeline) pipeline->Release();
     if (signature) signature->Release();
@@ -452,15 +452,15 @@ void DirectX12::initialize(
     allowedRenderArea->right = LONG_MAX;
     allowedRenderArea->bottom = LONG_MAX;
 
-    texturModel = new TexturModel(this, "_framework_gui_");
+    texturModel = new TextureModel(this, "_framework_gui_");
 
     Image* renderB = new Image(1);
     renderB->setAlpha3D(1);
     renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
-    uiTextur = createOrGetTextur("_f_Render_Image", renderB);
+    uiTexture = createOrGetTexture("_f_Render_Image", renderB);
 
     texturModel->setSize(Vec2<float>(2.f, 2.f));
-    texturModel->setTextur(dynamic_cast<Textur*>(uiTextur->getThis()));
+    texturModel->setTexture(dynamic_cast<Texture*>(uiTexture->getThis()));
 
     vertexBufferView = new D3D12_VERTEX_BUFFER_VIEW();
     vertexBufferView->StrideInBytes = sizeof(Vertex3D);
@@ -738,7 +738,7 @@ void DirectX12::initialize(
     device->CreateConstantBufferView(&desc, sbHeapHandle);
     sbHeapHandle.ptr += incr;
 
-    uiTextur->updateTextur();
+    uiTexture->updateTextur();
 
     D3D12_SHADER_RESOURCE_VIEW_DESC vd;
     vd.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
@@ -749,7 +749,7 @@ void DirectX12::initialize(
     vd.Texture2D.PlaneSlice = 0;
     vd.Texture2D.ResourceMinLODClamp = 0;
     device->CreateShaderResourceView(
-        ((DX12Textur*)uiTextur)->getResource(), &vd, sbHeapHandle);
+        ((DX12Texture*)uiTexture)->getResource(), &vd, sbHeapHandle);
 
     directCommandQueue->execute();
 
@@ -923,14 +923,14 @@ void DirectX12::update()
     device->CreateDepthStencilView(
         depthBuffer, &dsv, dsvHeap->GetCPUDescriptorHandleForHeapStart());
 
-    if (uiTextur) uiTextur->release();
+    if (uiTexture) uiTexture->release();
 
     Image* renderB = new Image(1);
     renderB->setAlpha3D(1);
     renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
-    uiTextur = createOrGetTextur("_f_Render_Image", renderB);
+    uiTexture = createOrGetTexture("_f_Render_Image", renderB);
 
-    texturModel->setTextur(dynamic_cast<Textur*>(uiTextur->getThis()));
+    texturModel->setTexture(dynamic_cast<Texture*>(uiTexture->getThis()));
 
     factory->Release();
 }
@@ -948,7 +948,7 @@ void DirectX12::beginFrame(bool fill2D, bool fill3D, int fillColor)
 
     directCommandQueue->getCommandList()->ResourceBarrier(1, &barrier);
 
-    if (fill2D) uiTextur->zImage()->setFarbe(fillColor);
+    if (fill2D) uiTexture->zImage()->setFarbe(fillColor);
     if (fill3D)
     {
         float color[4];
@@ -991,14 +991,14 @@ void DirectX12::renderObject(Model3D* zObj)
     unsigned int offset = 0;
     unsigned int es
         = (unsigned)zObj->zModelData()->zDXVertexBuffer()->getElementLength();
-    Model3DTextur* zTextur = zObj->zTextur();
+    Model3DTexture* zTexture = zObj->zTexture();
     int ind = 0;
     zObj->beforeRender(this, vertexShader, pixelShader);
     for (auto i = zObj->zModelData()->getPolygons(); i; i++)
     {
         if (zObj->needRenderPolygon(ind))
         {
-            Textur* t = zTextur->zPolygonTextur(ind);
+            Texture* t = zTexture->zPolygonTexture(ind);
             // if( t &&t->brauchtUpdate() )
             //     t->updateTextur();
             DXGI_FORMAT f = DXGI_FORMAT_R32_UINT;
@@ -1010,7 +1010,7 @@ void DirectX12::renderObject(Model3D* zObj)
             if (t)
             {
                 /*ID3D11ShaderResourceView *v[ 3 ];
-                v[ 0 ] = *(DX11Textur *)t;
+                v[ 0 ] = *(DX11Texture *)t;
                 v[ 1 ] = *diffuseLights;
                 v[ 2 ] = *pointLights;
                 d3d11Context->PSSetShaderResources( 0, 3, v );
@@ -1068,7 +1068,7 @@ void DirectX12::renderObject(Model3D* zObj)
             {
                 /*d3d11Context->RSSetState( meshRS );
                 ID3D11ShaderResourceView *v[ 3 ];
-                v[ 0 ] = *(DX11Textur *)defaultTextur;
+                v[ 0 ] = *(DX11Texture *)defaultTexture;
                 v[ 1 ] = *diffuseLights;
                 v[ 2 ] = *pointLights;
                 d3d11Context->PSSetShaderResources( 0, 3, v );
@@ -1101,7 +1101,7 @@ bool DirectX12::isInFrustrum(
     return 1;
 }
 
-void DirectX12::renderKamera(Kam3D* zKamera)
+void DirectX12::renderKamera(Cam3D* zKamera)
 {
     directCommandQueue->getCommandList()->RSSetViewports(
         1, (D3D12_VIEWPORT*)zKamera->zViewPort());
@@ -1149,7 +1149,7 @@ void DirectX12::renderKamera(Kam3D* zKamera)
             (char*)viewAndProj, 0, sizeof(Mat4<float>) * 2);
     if (pixelShader)
         pixelShader->fuellConstBuffer((char*)&kamPos, 2, sizeof(float) * 3);
-    Welt3D* w = zKamera->zWelt();
+    World3D* w = zKamera->zWorld();
     w->render([this](Model3D* obj) {
         if (isInFrustrum(obj->getPos(), obj->getRadius())) renderObject(obj);
     });
@@ -1165,7 +1165,7 @@ void DirectX12::presentFrame()
         vertexShader->fuellConstBuffer(
             (char*)viewAndProj, 0, sizeof(Mat4<float>) * 2);
 
-    uiTextur->updateTextur();
+    uiTexture->updateTextur();
 
     if (fenster && !IsIconic(fenster->getWindowHandle()))
         renderObject(texturModel);
@@ -1188,22 +1188,22 @@ void DirectX12::presentFrame()
     backBufferIndex = swapChain->GetCurrentBackBufferIndex();
 }
 
-Textur* DirectX12::createOrGetTextur(const char* name, Image* b)
+Texture* DirectX12::createOrGetTexture(const char* name, Image* b)
 {
     if (!device)
     {
         if (b) b->release();
         return 0;
     }
-    if (texturRegister->hatTextur(name))
+    if (texturRegister->hasTexture(name))
     {
-        Textur* ret = texturRegister->getTextur(name);
+        Texture* ret = texturRegister->getTexture(name);
         if (b) ret->setImageZ(b);
         return ret;
     }
-    Textur* ret = new DX12Textur(device, copyCommandQueue, directCommandQueue);
+    Texture* ret = new DX12Texture(device, copyCommandQueue, directCommandQueue);
     if (b) ret->setImageZ(b);
-    texturRegister->addTextur(dynamic_cast<Textur*>(ret->getThis()), name);
+    texturRegister->addTexture(dynamic_cast<Texture*>(ret->getThis()), name);
     ret->updateTextur();
     copyCommandQueue->execute();
     directCommandQueue->execute();
@@ -1212,7 +1212,7 @@ Textur* DirectX12::createOrGetTextur(const char* name, Image* b)
 
 Image* DirectX12::zUIRenderImage() const
 {
-    return uiTextur ? uiTextur->zImage() : 0;
+    return uiTexture ? uiTexture->zImage() : 0;
 }
 
 bool DirectX12::isAvailable()

DX12Texture.cpp

@@ -6,10 +6,10 @@
 
 using namespace Framework;
 
-DX12Textur::DX12Textur(ID3D12Device* device,
+DX12Texture::DX12Texture(ID3D12Device* device,
     DX12CopyCommandQueue* copy,
     DX12DirectCommandQueue* direct)
-    : Textur(),
+    : Texture(),
       buffer(0),
       intermediate(0),
       device(device),
@@ -18,7 +18,7 @@ DX12Textur::DX12Textur(ID3D12Device* device,
       shaderResource(0)
 {}
 
-DX12Textur::~DX12Textur()
+DX12Texture::~DX12Texture()
 {
 #ifdef WIN32
     if (buffer) buffer->Release();
@@ -28,7 +28,7 @@ DX12Textur::~DX12Textur()
 
 // Updates the texture. The pixels of the current image are copied into the
 // graphics memory
-bool DX12Textur::updateTextur()
+bool DX12Texture::updateTextur()
 {
     if (!bild) return 0;
 #ifdef WIN32
@@ -127,13 +127,13 @@ bool DX12Textur::updateTextur()
 }
 
 // Returns true if updateTextur needs to be called
-bool DX12Textur::brauchtUpdate() const
+bool DX12Texture::brauchtUpdate() const
 {
     return bild && !buffer;
 }
 
 // Returns the DX12 resource
-ID3D12Resource* DX12Textur::getResource()
+ID3D12Resource* DX12Texture::getResource()
 {
     return buffer;
 }

DX12Texture.h

@@ -9,7 +9,7 @@ struct ID3D12GraphicsCommandList;
 
 namespace Framework
 {
-    class DX12Textur : public Textur
+    class DX12Texture : public Texture
     {
     private:
         ID3D12Resource* buffer;
@@ -20,10 +20,10 @@ namespace Framework
         bool shaderResource;
 
     public:
-        DLLEXPORT DX12Textur(ID3D12Device* device,
+        DLLEXPORT DX12Texture(ID3D12Device* device,
             DX12CopyCommandQueue* copy,
             DX12DirectCommandQueue* direct);
-        DLLEXPORT ~DX12Textur();
+        DLLEXPORT ~DX12Texture();
         //! Updates the texture. The pixels of the current image are copied
         //! to graphics memory
         DLLEXPORT bool updateTextur() override;

DX9GraphicsApi.cpp

@@ -166,12 +166,12 @@ void DirectX9::beginFrame(bool fill2D, bool fill3D, int fillColor)
     if (fill2D) uiImage->setFarbe(fillColor);
 }
 
-void DirectX9::renderKamera(Kam3D* zKamera)
+void DirectX9::renderKamera(Cam3D* zKamera)
 {
     Mat4<float> mat = zKamera->getProjectionMatrix();
     Mat4<float> inv = zKamera->getViewMatrix().getInverse();
-    Welt3D* welt = zKamera->zWelt();
-    ZeitMesser zm = ZeitMesser();
+    World3D* welt = zKamera->zWorld();
+    Timer zm = Timer();
     zm.messungStart();
     for (int x = 0; x < zKamera->zViewPort()->width; x++)
     {
@@ -246,9 +246,9 @@ void DirectX9::presentFrame()
     }
 }
 
-Textur* DirectX9::createOrGetTextur(const char* name, Image* b)
+Texture* DirectX9::createOrGetTexture(const char* name, Image* b)
 {
-    Textur* ret = new DX9Textur();
+    Texture* ret = new DX9Texture();
     ret->setImageZ(b);
     return ret;
 }

DataValidator.cpp

@@ -1,4 +1,4 @@
-#include "DataValidator.h"
+#include "DataValidator.h"
 
 #include "Logging.h"
 #include "Regex.h"
@@ -84,7 +84,7 @@ JSON::JSONValue* TypeMissmatch::getValidPart(
             {
                 if (removedPartsValidationResults)
                 {
-                    if (temporaryInvalidParts.getEintragAnzahl() == 1)
+                    if (temporaryInvalidParts.getEntryCount() == 1)
                     {
                         if (reason) reason->release();
                         reason = temporaryInvalidParts.get(0);
@@ -167,7 +167,7 @@ JSON::JSONValue* TypeMissmatch::getValidPart(
             {
                 if (removedPartsValidationResults)
                 {
-                    if (temporaryInvalidParts.getEintragAnzahl() == 1)
+                    if (temporaryInvalidParts.getEntryCount() == 1)
                     {
                         if (reason) reason->release();
                         reason = temporaryInvalidParts.get(0);
@@ -573,7 +573,7 @@ bool NoTypeMatching::isDifferent(const ValidationResult* zResult) const
     const NoTypeMatching* casted = dynamic_cast<const NoTypeMatching*>(zResult);
     if (casted == 0) return 1;
     if (!casted->getPath().istGleich(path)) return 1;
-    for (int i = 0; i < reasons.getEintragAnzahl(); i++)
+    for (int i = 0; i < reasons.getEntryCount(); i++)
     {
         if (reasons.z(i)->isDifferent(casted->reasons.z(i))) return 1;
     }
@@ -1286,12 +1286,12 @@ ValidationResult* DataValidator::validateMultipleTypes(
             }
         }
     }
-    if (hasTypeAttr && possibleConstraints.getEintragAnzahl() == 1)
+    if (hasTypeAttr && possibleConstraints.getEntryCount() == 1)
         return validate(pathToValidate,
             zChildValue,
             possibleConstraints.begin().val(),
             childPath); // if the type is clear
-    else if (hasTypeAttr && possibleConstraints.getEintragAnzahl() > 0)
+    else if (hasTypeAttr && possibleConstraints.getEntryCount() > 0)
     { // more then one type is possible
         RCArray<ValidationResult> invalidResults;
         int index = pathToValidate->getCurrentPathElementIndex();

Diagram.cpp

@@ -13,9 +13,9 @@
 
 using namespace Framework;
 
-// Contents of the SLDiag class from Diagram.h
+// Contents of the LineDiagram class from Diagram.h
 // Constructor
-SLDiag::SLDiag()
+LineDiagram::LineDiagram()
     : DrawableBackground(),
       gF(0xFF000000),
       lFarbe(new Array<int>()),
@@ -31,7 +31,7 @@ SLDiag::SLDiag()
 }
 
 // Destructor
-SLDiag::~SLDiag()
+LineDiagram::~LineDiagram()
 {
     lFarbe->release();
     lName->release();
@@ -42,13 +42,13 @@ SLDiag::~SLDiag()
 }
 
 // non-constant
-void SLDiag::setTextRendererZ(TextRenderer* textRd)
+void LineDiagram::setTextRendererZ(TextRenderer* textRd)
 {
     if (this->textRd) this->textRd->release();
     this->textRd = textRd;
 }
 
-void SLDiag::setFontZ(Font* schrift) // sets the font
+void LineDiagram::setFontZ(Font* schrift) // sets the font
 {
     if (!this->textRd)
         textRd = new TextRenderer(schrift);
@@ -57,25 +57,25 @@ void SLDiag::setFontZ(Font* schrift) // sets the font
     rend = 1;
 }
 
-void SLDiag::setGSize(Punkt& gr) // sets the grid size
+void LineDiagram::setGSize(Punkt& gr) // sets the grid size
 {
     gitterGr = gr;
     rend = 1;
 }
 
-void SLDiag::setGFarbe(int f) // sets the grid color
+void LineDiagram::setGFarbe(int f) // sets the grid color
 {
     gF = f;
     rend = 1;
 }
 
-void SLDiag::addLinie(const char* name) // adds a line
+void LineDiagram::addLinie(const char* name) // adds a line
 {
     addLinie(new Text(name));
     rend = 1;
 }
 
-void SLDiag::addLinie(Text* txt)
+void LineDiagram::addLinie(Text* txt)
 {
     lFarbe->add(0xFFFFFFFF, lines);
     lName->add(txt, lines);
@@ -87,13 +87,13 @@ void SLDiag::addLinie(Text* txt)
     rend = 1;
 }
 
-void SLDiag::setLFarbe(int lNum, int f) // sets the line color
+void LineDiagram::setLFarbe(int lNum, int f) // sets the line color
 {
     lFarbe->set(f, lNum);
     rend = 1;
 }
 
-void SLDiag::addPunkt(int lNum, int x, int h) // adds a point
+void LineDiagram::addPunkt(int lNum, int x, int h) // adds a point
 {
     Array<int>* ph_tmp = ph->z(lNum);
     Array<int>* pb_tmp = pb->z(lNum);
@@ -106,7 +106,7 @@ void SLDiag::addPunkt(int lNum, int x, int h) // adds a point
         {
             ph_tmp->remove(0);
             pb_tmp->remove(0);
-            if (!pb_tmp->getEintragAnzahl() || !ph_tmp->getEintragAnzahl())
+            if (!pb_tmp->getEntryCount() || !ph_tmp->getEntryCount())
                 break;
             int ii = -i;
             i = pb_tmp->get(0);
@@ -120,7 +120,7 @@ void SLDiag::addPunkt(int lNum, int x, int h) // adds a point
     rend = 1;
 }
 
-void SLDiag::removeLinie(int lNum) // removes a line
+void LineDiagram::removeLinie(int lNum) // removes a line
 {
     lFarbe->remove(lNum);
     lName->remove(lNum);
@@ -130,7 +130,7 @@ void SLDiag::removeLinie(int lNum) // removes a line
     rend = 1;
 }
 
-void SLDiag::render(Image& zRObj) // draws to zRObj
+void LineDiagram::render(Image& zRObj) // draws to zRObj
 {
     if (hatStyle(Style::Sichtbar))
     {
@@ -185,8 +185,8 @@ void SLDiag::render(Image& zRObj) // draws to zRObj
             {
                 int lastX = 0;
                 int lastY = innenSize.y - 1;
-                int ph_anz = ph_tmp->getEintragAnzahl();
-                int pb_anz = pb_tmp->getEintragAnzahl();
+                int ph_anz = ph_tmp->getEntryCount();
+                int pb_anz = pb_tmp->getEntryCount();
                 for (int ii = 0; ii < ph_anz && ii < pb_anz; ++ii)
                 {
                     if (!ph_tmp || !pb_tmp) break;
@@ -212,28 +212,28 @@ void SLDiag::render(Image& zRObj) // draws to zRObj
 }
 
 // constant
-Font* SLDiag::getFont() const // returns the font
+Font* LineDiagram::getFont() const // returns the font
 {
     if (textRd) return textRd->getFont();
     return 0;
 }
 
-Font* SLDiag::zFont() const
+Font* LineDiagram::zFont() const
 {
     return textRd ? textRd->zFont() : 0;
 }
 
-const Punkt& SLDiag::getGSize() const // returns the grid size
+const Punkt& LineDiagram::getGSize() const // returns the grid size
 {
     return gitterGr;
 }
 
-int SLDiag::getGFarbe() const // returns the grid color
+int LineDiagram::getGFarbe() const // returns the grid color
 {
     return gF;
 }
 
-int SLDiag::getLinienNummer(const char* name) const // returns the line number
+int LineDiagram::getLinienNummer(const char* name) const // returns the line number
 {
     for (int i = 0; i < lines; ++i)
     {
@@ -242,7 +242,7 @@ int SLDiag::getLinienNummer(const char* name) const // returns the line number
     return -1;
 }
 
-int SLDiag::getLinienNummer(Text* name) const
+int LineDiagram::getLinienNummer(Text* name) const
 {
     for (int i = 0; i < lines; ++i)
     {
@@ -256,17 +256,17 @@ int SLDiag::getLinienNummer(Text* name) const
     return -1;
 }
 
-Text* SLDiag::getLinienName(int lNum) const // returns the line name
+Text* LineDiagram::getLinienName(int lNum) const // returns the line name
 {
     return lName->get(lNum);
 }
 
-Text* SLDiag::zLinienNamen(int lNum) const
+Text* LineDiagram::zLinienNamen(int lNum) const
 {
     return lName->z(lNum);
 }
 
-int SLDiag::getHighestValue() const // returns the highest value
+int LineDiagram::getHighestValue() const // returns the highest value
 {
     int ret = 0;
     for (int i = 0; i < lines; ++i)
@@ -277,53 +277,53 @@ int SLDiag::getHighestValue() const // returns the highest value
     return ret;
 }
 
-int SLDiag::getHighestValue(int lNum) const
+int LineDiagram::getHighestValue(int lNum) const
 {
     int ret = 0;
     Array<int>* tmp = ph->z(lNum);
-    int anz = tmp->getEintragAnzahl();
+    int anz = tmp->getEntryCount();
     for (int i = 0; i < anz; ++i)
         ret = ret >= tmp->get(i) ? ret : tmp->get(i);
     return ret;
 }
 
-int SLDiag::getMedian(int lNum) const // returns the average value
+int LineDiagram::getMedian(int lNum) const // returns the average value
 {
     int count;
     int all = 0;
     Array<int>* tmp = ph->z(lNum);
-    int anz = tmp->getEintragAnzahl();
+    int anz = tmp->getEntryCount();
     for (count = 1; count <= anz; ++count)
         all += tmp->get(count - 1);
     return (int)((double)all / count + 0.5);
 }
 
-int SLDiag::getLAnzahl() const // returns the number of lines
+int LineDiagram::getLAnzahl() const // returns the number of lines
 {
     return lines;
 }
 
-int SLDiag::getLastValue(int lNum) const // returns the last value
+int LineDiagram::getLastValue(int lNum) const // returns the last value
 {
     return lastValue->get(lNum);
 }
 
-// Contents of the DiagWert struct from Diagram.h
+// Contents of the DiagramValue struct from Diagram.h
 // Constructor
-DiagWert::DiagWert()
+DiagramValue::DiagramValue()
     : ReferenceCounter(),
       style(0),
       farbe(0xFFFFFFFF),
       hintergrund(0),
       name(new Text()),
-      punkte(new Array<DiagPunkt*>)
+      punkte(new Array<DiagramPoint*>)
 {}
 
 // Destructor
-DiagWert::~DiagWert()
+DiagramValue::~DiagramValue()
 {
     name->release();
-    int anz = punkte->getEintragAnzahl();
+    int anz = punkte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (punkte->hat(i)) delete punkte->get(i);
@@ -331,9 +331,9 @@ DiagWert::~DiagWert()
     punkte->release();
 }
 
-// Contents of the DiagDaten struct from Diagram.h
+// Contents of the DiagramData struct from Diagram.h
 // Constructor
-DiagDaten::DiagDaten()
+DiagramData::DiagramData()
     : ReferenceCounter(),
       style(0),
       rasterDicke(0),
@@ -350,11 +350,11 @@ DiagDaten::DiagDaten()
       vIntervallWerte(new Array<double>),
       hIntervallBreite(0),
       vIntervallHeight(0),
-      werte(new RCArray<DiagWert>())
+      werte(new RCArray<DiagramValue>())
 {}
 
 // Destructor
-DiagDaten::~DiagDaten()
+DiagramData::~DiagramData()
 {
     hIntervallName->release();
     vIntervallName->release();
@@ -365,23 +365,23 @@ DiagDaten::~DiagDaten()
     werte->release();
 }
 
-// Contents of the BaseDiag class from Diagram.h
+// Contents of the BaseDiagram class from Diagram.h
 // Constructor
-BaseDiag::BaseDiag(Critical* lock)
-    : daten(new DiagDaten()),
+BaseDiagram::BaseDiagram(Critical* lock)
+    : daten(new DiagramData()),
       changed(0),
       lock(lock)
 {}
 
 // Destructor
-BaseDiag::~BaseDiag()
+BaseDiagram::~BaseDiagram()
 {
     if (daten) daten->release();
 }
 
 // non-constant
-void BaseDiag::setDiagDatenZ(
-    DiagDaten* dd) // Sets a pointer to the diagram data
+void BaseDiagram::setDiagramDataZ(
+    DiagramData* dd) // Sets a pointer to the diagram data
 {
     lock->lock();
     if (daten) daten->release();
@@ -390,10 +390,10 @@ void BaseDiag::setDiagDatenZ(
     changed = 1;
 }
 
-void BaseDiag::setDiagDaten(DiagDaten* dd) // copies the diagram data
+void BaseDiagram::setDiagramData(DiagramData* dd) // copies the diagram data
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     daten->style = dd->style;
     daten->rasterBreite = dd->rasterBreite;
     daten->rasterHeight = dd->rasterHeight;
@@ -402,13 +402,13 @@ void BaseDiag::setDiagDaten(DiagDaten* dd) // copies the diagram data
     daten->vIntervallFarbe = dd->vIntervallFarbe;
     daten->hIntervallName->setText(*dd->hIntervallName);
     daten->vIntervallName->setText(*dd->vIntervallName);
-    int anz = dd->hIntervallWerte->getEintragAnzahl();
+    int anz = dd->hIntervallWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (dd->hIntervallWerte->hat(i))
             daten->hIntervallWerte->set(dd->hIntervallWerte->get(i), i);
     }
-    anz = dd->vIntervallWerte->getEintragAnzahl();
+    anz = dd->vIntervallWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (dd->vIntervallWerte->hat(i))
@@ -416,23 +416,23 @@ void BaseDiag::setDiagDaten(DiagDaten* dd) // copies the diagram data
     }
     daten->hIntervallBreite = dd->hIntervallBreite;
     daten->vIntervallHeight = dd->vIntervallHeight;
-    anz = dd->werte->getEintragAnzahl();
+    anz = dd->werte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        DiagWert* tmp = dd->werte->z(i);
+        DiagramValue* tmp = dd->werte->z(i);
         if (tmp)
         {
-            DiagWert* w = new DiagWert();
+            DiagramValue* w = new DiagramValue();
             w->style = tmp->style;
             w->farbe = tmp->farbe;
             w->hintergrund = tmp->hintergrund;
             w->name->setText(tmp->name->getText());
-            int anz = tmp->punkte->getEintragAnzahl();
+            int anz = tmp->punkte->getEntryCount();
             for (int j = 0; j < anz; ++j)
             {
                 if (tmp->punkte->hat(j))
                 {
-                    DiagPunkt* p = new DiagPunkt();
+                    DiagramPoint* p = new DiagramPoint();
                     p->hIntervall = tmp->punkte->get(j)->hIntervall;
                     p->vIntervall = tmp->punkte->get(j)->vIntervall;
                     w->punkte->set(p, j);
@@ -446,91 +446,91 @@ void BaseDiag::setDiagDaten(DiagDaten* dd) // copies the diagram data
     changed = 1;
 }
 
-void BaseDiag::setRasterDicke(int d) // set raster thickness
+void BaseDiagram::setRasterDicke(int d) // set raster thickness
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (daten->rasterDicke != d) changed = 1;
     daten->rasterDicke = d;
     lock->unlock();
 }
 
-void BaseDiag::setRasterBreite(int br) // set raster width
+void BaseDiagram::setRasterBreite(int br) // set raster width
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (daten->rasterBreite != br) changed = 1;
     daten->rasterBreite = br;
     lock->unlock();
 }
 
-void BaseDiag::setRasterHeight(int hi) // set raster height
+void BaseDiagram::setRasterHeight(int hi) // set raster height
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (daten->rasterHeight != hi) changed = 1;
     daten->rasterHeight = hi;
     lock->unlock();
 }
 
-void BaseDiag::setRasterFarbe(int f) // set raster color
+void BaseDiagram::setRasterFarbe(int f) // set raster color
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (daten->rasterFarbe != f) changed = 1;
     daten->rasterFarbe = f;
     lock->unlock();
 }
 
-void BaseDiag::setHIntervallBreite(double br) // interval width
+void BaseDiagram::setHIntervallBreite(double br) // interval width
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     daten->hIntervallBreite = br;
     lock->unlock();
 }
 
-void BaseDiag::setVIntervallHeight(double hi) // interval height
+void BaseDiagram::setVIntervallHeight(double hi) // interval height
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     daten->vIntervallHeight = hi;
     lock->unlock();
 }
 
-void BaseDiag::setHIntervallFarbe(int f) // color of the horizontal interval
+void BaseDiagram::setHIntervallFarbe(int f) // color of the horizontal interval
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (daten->hIntervallFarbe != f) changed = 1;
     daten->hIntervallFarbe = f;
     lock->unlock();
 }
 
-void BaseDiag::setVIntervallFarbe(int f) // color of the vertical interval
+void BaseDiagram::setVIntervallFarbe(int f) // color of the vertical interval
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (daten->vIntervallFarbe != f) changed = 1;
     daten->vIntervallFarbe = f;
     lock->unlock();
 }
 
-void BaseDiag::setHIntervallName(
+void BaseDiagram::setHIntervallName(
     const char* name) // Sets the name of the horizontal interval
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->hIntervallName) daten->hIntervallName = new Text();
     if (!daten->hIntervallName->istGleich(name)) changed = 1;
     daten->hIntervallName->setText(name);
     lock->unlock();
 }
 
-void BaseDiag::setHIntervallName(Text* name)
+void BaseDiagram::setHIntervallName(Text* name)
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->hIntervallName) daten->hIntervallName = new Text();
     if (!daten->hIntervallName->istGleich(*name)) changed = 1;
     daten->hIntervallName->setText(*name);
@@ -538,21 +538,21 @@ void BaseDiag::setHIntervallName(Text* name)
     lock->unlock();
 }
 
-void BaseDiag::setVIntervallName(
+void BaseDiagram::setVIntervallName(
     const char* name) // Sets the name of the vertical interval
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->vIntervallName) daten->vIntervallName = new Text();
     if (!daten->vIntervallName->istGleich(name)) changed = 1;
     daten->vIntervallName->setText(name);
     lock->unlock();
 }
 
-void BaseDiag::setVIntervallName(Text* name)
+void BaseDiagram::setVIntervallName(Text* name)
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->vIntervallName) daten->vIntervallName = new Text();
     if (!daten->vIntervallName->istGleich(*name)) changed = 1;
     daten->vIntervallName->setText(*name);
@@ -560,26 +560,26 @@ void BaseDiag::setVIntervallName(Text* name)
     lock->unlock();
 }
 
-void BaseDiag::addHIntervallText(double hIntervall,
+void BaseDiagram::addHIntervallText(double hIntervall,
     const char* text) // Add text for a horizontal interval
 {
     setHIntervallText(hIntervall, text);
 }
 
-void BaseDiag::addHIntervallText(double hIntervall, Text* text)
+void BaseDiagram::addHIntervallText(double hIntervall, Text* text)
 {
     setHIntervallText(hIntervall, *text);
     text->release();
 }
 
-void BaseDiag::setHIntervallTextZ(double hIntervall,
+void BaseDiagram::setHIntervallTextZ(double hIntervall,
     Text* text) // Sets the text of a horizontal interval
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->hIntervallWerte) daten->hIntervallWerte = new Array<double>();
     if (!daten->hIntervallTexte) daten->hIntervallTexte = new RCArray<Text>();
-    int anz = daten->hIntervallWerte->getEintragAnzahl();
+    int anz = daten->hIntervallWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->hIntervallWerte->hat(i)
@@ -597,19 +597,19 @@ void BaseDiag::setHIntervallTextZ(double hIntervall,
     changed = 1;
 }
 
-void BaseDiag::setHIntervallText(double hIntervall, Text* text)
+void BaseDiagram::setHIntervallText(double hIntervall, Text* text)
 {
     setHIntervallText(hIntervall, *text);
     text->release();
 }
 
-void BaseDiag::setHIntervallText(double hIntervall, const char* text)
+void BaseDiagram::setHIntervallText(double hIntervall, const char* text)
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->hIntervallWerte) daten->hIntervallWerte = new Array<double>();
     if (!daten->hIntervallTexte) daten->hIntervallTexte = new RCArray<Text>();
-    int anz = daten->hIntervallWerte->getEintragAnzahl();
+    int anz = daten->hIntervallWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->hIntervallWerte->hat(i)
@@ -630,14 +630,14 @@ void BaseDiag::setHIntervallText(double hIntervall, const char* text)
     changed = 1;
 }
 
-void BaseDiag::removeHIntervallText(
+void BaseDiagram::removeHIntervallText(
     double hIntervall) // removes the text of a horizontal interval
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->hIntervallWerte) daten->hIntervallWerte = new Array<double>();
     if (!daten->hIntervallTexte) daten->hIntervallTexte = new RCArray<Text>();
-    int anz = daten->hIntervallWerte->getEintragAnzahl();
+    int anz = daten->hIntervallWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->hIntervallWerte->hat(i)
@@ -653,26 +653,26 @@ void BaseDiag::removeHIntervallText(
     lock->unlock();
 }
 
-void BaseDiag::addVIntervallText(double vIntervall,
+void BaseDiagram::addVIntervallText(double vIntervall,
     const char* text) // Add text for a vertical interval
 {
     setVIntervallText(vIntervall, text);
 }
 
-void BaseDiag::addVIntervallText(double vIntervall, Text* text)
+void BaseDiagram::addVIntervallText(double vIntervall, Text* text)
 {
     setVIntervallText(vIntervall, *text);
     text->release();
 }
 
-void BaseDiag::setVIntervallTextZ(
+void BaseDiagram::setVIntervallTextZ(
     double vIntervall, Text* text) // Sets the text of a vertical interval
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->vIntervallWerte) daten->vIntervallWerte = new Array<double>();
     if (!daten->vIntervallTexte) daten->vIntervallTexte = new RCArray<Text>();
-    int anz = daten->vIntervallWerte->getEintragAnzahl();
+    int anz = daten->vIntervallWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->vIntervallWerte->hat(i)
@@ -690,19 +690,19 @@ void BaseDiag::setVIntervallTextZ(
     changed = 1;
 }
 
-void BaseDiag::setVIntervallText(double vIntervall, Text* text)
+void BaseDiagram::setVIntervallText(double vIntervall, Text* text)
 {
     setVIntervallText(vIntervall, *text);
     text->release();
 }
 
-void BaseDiag::setVIntervallText(double vIntervall, const char* text)
+void BaseDiagram::setVIntervallText(double vIntervall, const char* text)
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->vIntervallWerte) daten->vIntervallWerte = new Array<double>();
     if (!daten->vIntervallTexte) daten->vIntervallTexte = new RCArray<Text>();
-    int anz = daten->vIntervallWerte->getEintragAnzahl();
+    int anz = daten->vIntervallWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->vIntervallWerte->hat(i)
@@ -723,14 +723,14 @@ void BaseDiag::setVIntervallText(double vIntervall, const char* text)
     changed = 1;
 }
 
-void BaseDiag::removeVIntervallText(
+void BaseDiagram::removeVIntervallText(
     double vIntervall) // removes the text of a vertical interval
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (!daten->vIntervallWerte) daten->vIntervallWerte = new Array<double>();
     if (!daten->vIntervallTexte) daten->vIntervallTexte = new RCArray<Text>();
-    int anz = daten->vIntervallWerte->getEintragAnzahl();
+    int anz = daten->vIntervallWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->vIntervallWerte->hat(i)
@@ -746,30 +746,30 @@ void BaseDiag::removeVIntervallText(
     lock->unlock();
 }
 
-void BaseDiag::addWertZ(DiagWert* w) // Adds a value
+void BaseDiagram::addWertZ(DiagramValue* w) // Adds a value
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
     daten->werte->add(w);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiag::addWert(DiagWert* w)
+void BaseDiagram::addWert(DiagramValue* w)
 {
     lock->lock();
-    DiagWert* tmp = new DiagWert();
+    DiagramValue* tmp = new DiagramValue();
     tmp->style = w->style;
     tmp->farbe = w->farbe;
     tmp->hintergrund = w->hintergrund;
     tmp->name->setText(*w->name);
-    int anz = w->punkte->getEintragAnzahl();
+    int anz = w->punkte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (w->punkte->hat(i))
         {
-            DiagPunkt* p = new DiagPunkt();
+            DiagramPoint* p = new DiagramPoint();
             p->hIntervall = w->punkte->get(i)->hIntervall;
             p->vIntervall = w->punkte->get(i)->vIntervall;
             tmp->punkte->set(p, i);
@@ -781,62 +781,62 @@ void BaseDiag::addWert(DiagWert* w)
     changed = 1;
 }
 
-void BaseDiag::addWert(const char* name)
+void BaseDiagram::addWert(const char* name)
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
-    DiagWert* w = new DiagWert();
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
+    DiagramValue* w = new DiagramValue();
     w->name->setText(name);
     daten->werte->add(w);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiag::addWert(Text* txt)
+void BaseDiagram::addWert(Text* txt)
 {
     addWert(*txt);
     txt->release();
 }
 
-void BaseDiag::setWertFarbe(int wNum, int f) // sets the color of a value
+void BaseDiagram::setWertFarbe(int wNum, int f) // sets the color of a value
 {
     if (wNum < 0) return;
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     daten->werte->z(wNum)->farbe = f;
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiag::addPunktZ(int wNum, DiagPunkt* p) // adds a point to a value
+void BaseDiagram::addPunktZ(int wNum, DiagramPoint* p) // adds a point to a value
 {
     if (wNum < 0) return;
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
     while (!daten->werte->hat(wNum))
-        daten->werte->add(new DiagWert());
+        daten->werte->add(new DiagramValue());
     if (!daten->werte->z(wNum)->punkte)
-        daten->werte->z(wNum)->punkte = new Array<DiagPunkt*>();
+        daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
     daten->werte->z(wNum)->punkte->add(p);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiag::addPunkt(int wNum, DiagPunkt* p)
+void BaseDiagram::addPunkt(int wNum, DiagramPoint* p)
 {
     if (wNum < 0) return;
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
     while (!daten->werte->hat(wNum))
-        daten->werte->add(new DiagWert());
+        daten->werte->add(new DiagramValue());
     if (!daten->werte->z(wNum)->punkte)
-        daten->werte->z(wNum)->punkte = new Array<DiagPunkt*>();
-    DiagPunkt* tmp = new DiagPunkt();
+        daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
+    DiagramPoint* tmp = new DiagramPoint();
     tmp->hIntervall = p->hIntervall;
     tmp->vIntervall = p->vIntervall;
     daten->werte->z(wNum)->punkte->add(tmp);
@@ -844,16 +844,16 @@ void BaseDiag::addPunkt(int wNum, DiagPunkt* p)
     changed = 1;
 }
 
-void BaseDiag::addPunkt(int wNum, double hI, double vI)
+void BaseDiagram::addPunkt(int wNum, double hI, double vI)
 {
     if (wNum < 0) return;
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (!daten->werte->z(wNum)->punkte)
-        daten->werte->z(wNum)->punkte = new Array<DiagPunkt*>();
-    DiagPunkt* tmp = new DiagPunkt();
+        daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
+    DiagramPoint* tmp = new DiagramPoint();
     tmp->hIntervall = hI;
     tmp->vIntervall = vI;
     daten->werte->z(wNum)->punkte->add(tmp);
@@ -862,30 +862,30 @@ void BaseDiag::addPunkt(int wNum, double hI, double vI)
 }
 
 // changes an existing point
-void BaseDiag::setPunktZ(int wNum, double hI, DiagPunkt* p)
+void BaseDiagram::setPunktZ(int wNum, double hI, DiagramPoint* p)
 {
-    setPunktZ(wNum, getDiagPunktPos(wNum, hI), p);
+    setPunktZ(wNum, getDiagramPointPos(wNum, hI), p);
 }
 
-void BaseDiag::setPunkt(int wNum, double hI, DiagPunkt* p)
+void BaseDiagram::setPunkt(int wNum, double hI, DiagramPoint* p)
 {
-    setPunkt(wNum, getDiagPunktPos(wNum, hI), p->hIntervall, p->vIntervall);
+    setPunkt(wNum, getDiagramPointPos(wNum, hI), p->hIntervall, p->vIntervall);
 }
 
-void BaseDiag::setPunkt(int wNum, double hI, double h, double v)
+void BaseDiagram::setPunkt(int wNum, double hI, double h, double v)
 {
-    setPunkt(wNum, getDiagPunktPos(wNum, hI), h, v);
+    setPunkt(wNum, getDiagramPointPos(wNum, hI), h, v);
 }
 
-void BaseDiag::setPunktZ(int wNum, int pNum, DiagPunkt* p)
+void BaseDiagram::setPunktZ(int wNum, int pNum, DiagramPoint* p)
 {
     if (pNum < 0 || wNum < 0) return;
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (!daten->werte->z(wNum)->punkte)
-        daten->werte->z(wNum)->punkte = new Array<DiagPunkt*>();
+        daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
     if (daten->werte->z(wNum)->punkte->hat(pNum))
         delete daten->werte->z(wNum)->punkte->get(pNum);
     daten->werte->z(wNum)->punkte->set(p, pNum);
@@ -893,23 +893,23 @@ void BaseDiag::setPunktZ(int wNum, int pNum, DiagPunkt* p)
     changed = 1;
 }
 
-void BaseDiag::setPunkt(int wNum, int pNum, DiagPunkt* p)
+void BaseDiagram::setPunkt(int wNum, int pNum, DiagramPoint* p)
 {
     if (pNum < 0 || wNum < 0) return;
     setPunkt(wNum, pNum, p->hIntervall, p->vIntervall);
 }
 
-void BaseDiag::setPunkt(int wNum, int pNum, double h, double v)
+void BaseDiagram::setPunkt(int wNum, int pNum, double h, double v)
 {
     if (pNum < 0 || wNum < 0) return;
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (!daten->werte->z(wNum)->punkte)
-        daten->werte->z(wNum)->punkte = new Array<DiagPunkt*>();
+        daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
     if (!daten->werte->z(wNum)->punkte->hat(pNum))
-        daten->werte->z(wNum)->punkte->set(new DiagPunkt(), pNum);
+        daten->werte->z(wNum)->punkte->set(new DiagramPoint(), pNum);
     daten->werte->z(wNum)->punkte->get(pNum)->hIntervall = h;
     daten->werte->z(wNum)->punkte->get(pNum)->vIntervall = v;
     lock->unlock();
@@ -917,15 +917,15 @@ void BaseDiag::setPunkt(int wNum, int pNum, double h, double v)
 }
 
 // Deletes an existing point
-void BaseDiag::removePunkt(int wNum, double hI)
+void BaseDiagram::removePunkt(int wNum, double hI)
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (!daten->werte->z(wNum)->punkte)
-        daten->werte->z(wNum)->punkte = new Array<DiagPunkt*>();
-    int anz = daten->werte->z(wNum)->punkte->getEintragAnzahl();
+        daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
+    int anz = daten->werte->z(wNum)->punkte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->werte->z(wNum)->punkte->hat(i)
@@ -941,14 +941,14 @@ void BaseDiag::removePunkt(int wNum, double hI)
     lock->unlock();
 }
 
-void BaseDiag::removePunkt(int wNum, int pNum)
+void BaseDiagram::removePunkt(int wNum, int pNum)
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (!daten->werte->z(wNum)->punkte)
-        daten->werte->z(wNum)->punkte = new Array<DiagPunkt*>();
+        daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
     if (daten->werte->z(wNum)->punkte->hat(pNum))
     {
         delete daten->werte->z(wNum)->punkte->get(pNum);
@@ -958,25 +958,25 @@ void BaseDiag::removePunkt(int wNum, int pNum)
     lock->unlock();
 }
 
-void BaseDiag::removeWert(int wNum) // removes a value
+void BaseDiagram::removeWert(int wNum) // removes a value
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
     daten->werte->remove(wNum);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiag::removeWert(const char* name)
+void BaseDiagram::removeWert(const char* name)
 {
     lock->lock();
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte) daten->werte = new RCArray<DiagWert>();
-    int anz = daten->werte->getEintragAnzahl();
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
+    int anz = daten->werte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        DiagWert* tmp = daten->werte->z(i);
+        DiagramValue* tmp = daten->werte->z(i);
         if (tmp && tmp->name && tmp->name->istGleich(name))
         {
             daten->werte->remove(i);
@@ -988,27 +988,27 @@ void BaseDiag::removeWert(const char* name)
     lock->unlock();
 }
 
-void BaseDiag::removeWert(Text* name)
+void BaseDiagram::removeWert(Text* name)
 {
     removeWert(name->getText());
     name->release();
 }
 
-void BaseDiag::addDatenStyle(int style) // Sets the style of the data
+void BaseDiagram::addDatenStyle(int style) // Sets the style of the data
 {
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if ((daten->style | style) != daten->style) changed = 1;
     daten->style |= style;
 }
 
-void BaseDiag::setDatenStyle(int style)
+void BaseDiagram::setDatenStyle(int style)
 {
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if (daten->style != style) changed = 1;
     daten->style = style;
 }
 
-void BaseDiag::setDatenStyle(int style, bool addRemove)
+void BaseDiagram::setDatenStyle(int style, bool addRemove)
 {
     if (addRemove)
         addDatenStyle(style);
@@ -1016,33 +1016,33 @@ void BaseDiag::setDatenStyle(int style, bool addRemove)
         removeDatenStyle(style);
 }
 
-void BaseDiag::removeDatenStyle(int style)
+void BaseDiagram::removeDatenStyle(int style)
 {
-    if (!daten) daten = new DiagDaten();
+    if (!daten) daten = new DiagramData();
     if ((daten->style & ~style) != daten->style) changed = 1;
     daten->style &= ~style;
 }
 
-void BaseDiag::addWertStyle(int wNum, int style) // Sets the style of a value
+void BaseDiagram::addWertStyle(int wNum, int style) // Sets the style of a value
 {
     if (wNum < 0) return;
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if ((daten->werte->z(wNum)->style | style) != daten->werte->z(wNum)->style)
         changed = 1;
     daten->werte->z(wNum)->style |= style;
 }
 
-void BaseDiag::setWertStyle(int wNum, int style)
+void BaseDiagram::setWertStyle(int wNum, int style)
 {
     if (wNum < 0) return;
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (daten->werte->z(wNum)->style != style) changed = 1;
     daten->werte->z(wNum)->style = style;
 }
 
-void BaseDiag::setWertStyle(int wNum, int style, bool addRemove)
+void BaseDiagram::setWertStyle(int wNum, int style, bool addRemove)
 {
     if (wNum < 0) return;
     if (addRemove)
@@ -1051,52 +1051,52 @@ void BaseDiag::setWertStyle(int wNum, int style, bool addRemove)
         removeWertStyle(wNum, style);
 }
 
-void BaseDiag::removeWertStyle(int wNum, int style)
+void BaseDiagram::removeWertStyle(int wNum, int style)
 {
     if (wNum < 0) return;
-    if (!daten) daten = new DiagDaten();
-    if (!daten->werte->z(wNum)) daten->werte->set(new DiagWert(), wNum);
+    if (!daten) daten = new DiagramData();
+    if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if ((daten->werte->z(wNum)->style & ~style) != daten->werte->z(wNum)->style)
         changed = 1;
     daten->werte->z(wNum)->style &= ~style;
 }
 
 // constant
-DiagDaten* BaseDiag::getDiagDaten() const // Returns the diagram data
+DiagramData* BaseDiagram::getDiagramData() const // Returns the diagram data
 {
-    return daten ? dynamic_cast<DiagDaten*>(daten->getThis()) : 0;
+    return daten ? dynamic_cast<DiagramData*>(daten->getThis()) : 0;
 }
 
-DiagDaten* BaseDiag::zDiagDaten() const
+DiagramData* BaseDiagram::zDiagramData() const
 {
     return daten;
 }
 
-DiagWert* BaseDiag::getDiagWert(int wNum) const // Returns the data of a value
+DiagramValue* BaseDiagram::getDiagramValue(int wNum) const // Returns the data of a value
 {
     return (daten && daten->werte) ? daten->werte->get(wNum) : 0;
 }
 
-DiagWert* BaseDiag::zDiagWert(int wNum) const
+DiagramValue* BaseDiagram::zDiagramValue(int wNum) const
 {
     return (daten && daten->werte) ? daten->werte->z(wNum) : 0;
 }
 
-DiagWert* BaseDiag::getDiagWert(const char* name) const
+DiagramValue* BaseDiagram::getDiagramValue(const char* name) const
 {
-    return getDiagWert(getDiagWertPos(name));
+    return getDiagramValue(getDiagramValuePos(name));
 }
 
-DiagWert* BaseDiag::zDiagWert(const char* name) const
+DiagramValue* BaseDiagram::zDiagramValue(const char* name) const
 {
-    return zDiagWert(getDiagWertPos(name));
+    return zDiagramValue(getDiagramValuePos(name));
 }
 
-int BaseDiag::getDiagWertPos(
+int BaseDiagram::getDiagramValuePos(
     const char* name) const // Returns the position of a value
 {
     if (!daten || !daten->werte) return -1;
-    int anz = daten->werte->getEintragAnzahl();
+    int anz = daten->werte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->werte->z(i) && daten->werte->z(i)->name
@@ -1106,13 +1106,13 @@ int BaseDiag::getDiagWertPos(
     return -1;
 }
 
-int BaseDiag::getDiagPunktPos(int wNum,
+int BaseDiagram::getDiagramPointPos(int wNum,
     double hI) const // Returns the position of a point from a value
 {
     if (!daten || !daten->werte || !daten->werte->z(wNum)
         || !daten->werte->z(wNum)->punkte)
         return -1;
-    int anz = daten->werte->z(wNum)->punkte->getEintragAnzahl();
+    int anz = daten->werte->z(wNum)->punkte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
         if (daten->werte->z(wNum)->punkte->hat(i)
@@ -1122,24 +1122,24 @@ int BaseDiag::getDiagPunktPos(int wNum,
     return -1;
 }
 
-int BaseDiag::getDiagPunktPos(char* wName, double hI) const
+int BaseDiagram::getDiagramPointPos(char* wName, double hI) const
 {
-    return getDiagPunktPos(getDiagWertPos(wName), hI);
+    return getDiagramPointPos(getDiagramValuePos(wName), hI);
 }
 
-bool BaseDiag::hatDatenStyle(int style) const // Checks the style of the data
+bool BaseDiagram::hatDatenStyle(int style) const // Checks the style of the data
 {
     if (!daten) return 0;
     return (daten->style | style) == daten->style;
 }
 
-bool BaseDiag::hatDatenStyleNicht(int style) const
+bool BaseDiagram::hatDatenStyleNicht(int style) const
 {
     if (!daten) return 1;
     return (daten->style | style) != daten->style;
 }
 
-bool BaseDiag::hatWertStyle(
+bool BaseDiagram::hatWertStyle(
     int wNum, int style) const // Checks the style of a value
 {
     if (!daten || !daten->werte || !daten->werte->z(wNum)) return 0;
@@ -1147,23 +1147,23 @@ bool BaseDiag::hatWertStyle(
         == daten->werte->z(wNum)->style;
 }
 
-bool BaseDiag::hatWertStyleNicht(int wNum, int style) const
+bool BaseDiagram::hatWertStyleNicht(int wNum, int style) const
 {
     if (!daten || !daten->werte || !daten->werte->z(wNum)) return 1;
     return (daten->werte->z(wNum)->style | style)
         != daten->werte->z(wNum)->style;
 }
 
-// Contents of the LDiag class from Diagram.h
+// Contents of the BarDiagram class from Diagram.h
 // Constructor
-LDiag::LDiag()
+BarDiagram::BarDiagram()
     : DrawableBackground(),
-      BaseDiag(&cs),
+      BaseDiagram(&cs),
       textRd(0),
       dRam(new LBorder()),
       dBgF(0),
       dBgB(0),
-      dAf(new AlphaFeld()),
+      dAf(new AlphaField()),
       vIntervallRB(new Image()),
       hIntervallRB(new Image()),
       schriftGr(12)
@@ -1174,7 +1174,7 @@ LDiag::LDiag()
 }
 
 // Destructor
-LDiag::~LDiag()
+BarDiagram::~BarDiagram()
 {
     if (textRd) textRd->release();
     if (dRam) dRam->release();
@@ -1184,9 +1184,9 @@ LDiag::~LDiag()
     if (hIntervallRB) hIntervallRB->release();
 }
 
-void LDiag::doMausEreignis(MausEreignis& me, bool userRet)
+void BarDiagram::doMouseEvent(MouseEvent& me, bool userRet)
 {
-    if (hatDatenStyle(DiagDaten::Style::Sichtbar)
+    if (hatDatenStyle(DiagramData::Style::Sichtbar)
         && (hatStyle(Style::HScroll) || hatStyle(Style::VScroll)) && userRet)
     {
         int rbr = 0;
@@ -1209,7 +1209,7 @@ void LDiag::doMausEreignis(MausEreignis& me, bool userRet)
 }
 
 // non-constant
-void LDiag::setTextRendererZ(TextRenderer* textRd)
+void BarDiagram::setTextRendererZ(TextRenderer* textRd)
 {
     lockDrawable();
     if (this->textRd) this->textRd->release();
@@ -1217,7 +1217,7 @@ void LDiag::setTextRendererZ(TextRenderer* textRd)
     unlockDrawable();
 }
 
-void LDiag::setFontZ(Font* schrift) // Sets the font
+void BarDiagram::setFontZ(Font* schrift) // Sets the font
 {
     lockDrawable();
     if (!this->textRd)
@@ -1228,7 +1228,7 @@ void LDiag::setFontZ(Font* schrift) // Sets the font
     unlockDrawable();
 }
 
-void LDiag::setSchriftSize(int gr)
+void BarDiagram::setSchriftSize(int gr)
 {
     lockDrawable();
     if (schriftGr != gr) rend = 1;
@@ -1236,7 +1236,7 @@ void LDiag::setSchriftSize(int gr)
     unlockDrawable();
 }
 
-void LDiag::setDataBorderZ(
+void BarDiagram::setDataBorderZ(
     Border* ram) // Sets the inner border around the actual diagram
 {
     lockDrawable();
@@ -1246,7 +1246,7 @@ void LDiag::setDataBorderZ(
     rend = 1;
 }
 
-void LDiag::setDataBorder(Border* ram)
+void BarDiagram::setDataBorder(Border* ram)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
@@ -1258,7 +1258,7 @@ void LDiag::setDataBorder(Border* ram)
     rend = 1;
 }
 
-void LDiag::setDatenRahmenBreite(int br)
+void BarDiagram::setDatenRahmenBreite(int br)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
@@ -1267,7 +1267,7 @@ void LDiag::setDatenRahmenBreite(int br)
     unlockDrawable();
 }
 
-void LDiag::setDatenRahmenFarbe(int f)
+void BarDiagram::setDatenRahmenFarbe(int f)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
@@ -1276,14 +1276,14 @@ void LDiag::setDatenRahmenFarbe(int f)
     rend = 1;
 }
 
-void LDiag::setDatenHintergrundFarbe(
+void BarDiagram::setDatenHintergrundFarbe(
     int f) // Sets the background of the actual diagram
 {
     dBgF = f;
     rend = 1;
 }
 
-void LDiag::setDatenHintergrundImageZ(Image* b)
+void BarDiagram::setDatenHintergrundImageZ(Image* b)
 {
     lockDrawable();
     if (dBgB) dBgB->release();
@@ -1292,7 +1292,7 @@ void LDiag::setDatenHintergrundImageZ(Image* b)
     rend = 1;
 }
 
-void LDiag::setDatenHintergrundImage(Image* b)
+void BarDiagram::setDatenHintergrundImage(Image* b)
 {
     lockDrawable();
     if (!dBgB) dBgB = new Image();
@@ -1303,8 +1303,8 @@ void LDiag::setDatenHintergrundImage(Image* b)
     rend = 1;
 }
 
-void LDiag::setDatenAlphaFeldZ(
-    AlphaFeld* af) // Sets the AlphaFeld of the actual diagram
+void BarDiagram::setDataAlphaFieldZ(
+    AlphaField* af) // Sets the AlphaField of the actual diagram
 {
     lockDrawable();
     if (dAf) dAf->release();
@@ -1313,10 +1313,10 @@ void LDiag::setDatenAlphaFeldZ(
     rend = 1;
 }
 
-void LDiag::setDatenAlphaFeld(AlphaFeld* af)
+void BarDiagram::setDataAlphaField(AlphaField* af)
 {
     lockDrawable();
-    if (!dAf) dAf = new AlphaFeld();
+    if (!dAf) dAf = new AlphaField();
     dAf->setFarbe(af->getFarbe());
     dAf->setStrength(af->getStrength());
     unlockDrawable();
@@ -1324,27 +1324,27 @@ void LDiag::setDatenAlphaFeld(AlphaFeld* af)
     rend = 1;
 }
 
-void LDiag::setDatenAlphaFeldFarbe(int f)
+void BarDiagram::setDatenAlphaFeldFarbe(int f)
 {
     lockDrawable();
-    if (!dAf) dAf = new AlphaFeld();
+    if (!dAf) dAf = new AlphaField();
     dAf->setFarbe(f);
     unlockDrawable();
     rend = 1;
 }
 
-void LDiag::setDatenAlphaFeldStrength(int st)
+void BarDiagram::setDatenAlphaFeldStrength(int st)
 {
     lockDrawable();
-    if (!dAf) dAf = new AlphaFeld();
+    if (!dAf) dAf = new AlphaField();
     if (dAf->getStrength() != st) rend = 1;
     dAf->setStrength(st);
     unlockDrawable();
 }
 
-void LDiag::render(Image& zRObj)
+void BarDiagram::render(Image& zRObj)
 {
-    if (!hatDatenStyle(DiagDaten::Style::Sichtbar)) return;
+    if (!hatDatenStyle(DiagramData::Style::Sichtbar)) return;
     DrawableBackground::render(zRObj);
     if (!zRObj.setDrawOptions(innenPosition, innenSize)) return;
     lockDrawable();
@@ -1356,13 +1356,13 @@ void LDiag::render(Image& zRObj)
     if (daten)
     { // calculating auto values
         vIAnz = daten->vIntervallWerte
-                  ? daten->vIntervallWerte->getEintragAnzahl()
+                  ? daten->vIntervallWerte->getEntryCount()
                   : 0;
         hIAnz = daten->hIntervallWerte
-                  ? daten->hIntervallWerte->getEintragAnzahl()
+                  ? daten->hIntervallWerte->getEntryCount()
                   : 0;
         if (daten->vIntervallWerte
-            && hatDatenStyle(DiagDaten::Style::AutoIntervallHeight))
+            && hatDatenStyle(DiagramData::Style::AutoIntervallHeight))
         {
             double maxW = 0;
             for (int i = 0; i < vIAnz; ++i)
@@ -1378,10 +1378,10 @@ void LDiag::render(Image& zRObj)
                 daten->vIntervallHeight
                     = maxW ? (vIntervallRB->getBreite() / maxW) : 0;
         }
-        if (hatDatenStyle(DiagDaten::Style::AutoRasterHeight))
+        if (hatDatenStyle(DiagramData::Style::AutoRasterHeight))
             daten->rasterHeight = daten->vIntervallHeight;
         if (daten->hIntervallWerte
-            && hatDatenStyle(DiagDaten::Style::AutoIntervallBreite))
+            && hatDatenStyle(DiagramData::Style::AutoIntervallBreite))
         {
             double maxW = 0;
             for (int i = 0; i < hIAnz; ++i)
@@ -1397,14 +1397,14 @@ void LDiag::render(Image& zRObj)
                 daten->hIntervallBreite
                     = maxW ? (hIntervallRB->getBreite() / maxW) : 0;
         }
-        if (hatDatenStyle(DiagDaten::Style::AutoRasterBreite))
+        if (hatDatenStyle(DiagramData::Style::AutoRasterBreite))
             daten->rasterBreite = daten->hIntervallBreite;
     }
-    if (hatDatenStyle(DiagDaten::Style::VIntervall) && textRd && schriftGr
+    if (hatDatenStyle(DiagramData::Style::VIntervall) && textRd && schriftGr
         && daten)
     { // rendering of the vertical interval
         int vIRBbr = innenSize.y;
-        if (hatDatenStyle(DiagDaten::Style::HIntervall)
+        if (hatDatenStyle(DiagramData::Style::HIntervall)
             && daten->hIntervallFarbe)
             vIRBbr -= schriftGr + 2;
         if (vIRBbr > 0)
@@ -1449,12 +1449,12 @@ void LDiag::render(Image& zRObj)
                 for (int i = anz - 1; i >= 0; --i)
                 {
                     txt = "";
-                    if (hatDatenStyle(DiagDaten::Style::VIntervallTexte)
+                    if (hatDatenStyle(DiagramData::Style::VIntervallTexte)
                         && daten->vIntervallTexte
                         && daten->vIntervallTexte->z(rf[i]))
                         txt = daten->vIntervallTexte->z(rf[i])->getText();
                     else if (hatDatenStyleNicht(
-                                 DiagDaten::Style::VIntervallTexte)
+                                 DiagramData::Style::VIntervallTexte)
                              || !daten->vIntervallWerte)
                         txt = daten->vIntervallWerte->get(rf[i]);
                     xPos = (int)(daten->vIntervallWerte->get(rf[i])
@@ -1494,7 +1494,7 @@ void LDiag::render(Image& zRObj)
                     *vIntervallRB,
                     daten->vIntervallFarbe);
             }
-            if (hatDatenStyle(DiagDaten::Style::HIntervall)
+            if (hatDatenStyle(DiagramData::Style::HIntervall)
                 && daten->hIntervallFarbe)
                 zRObj.alphaImage90(innenSize.x - vIntervallRB->getHeight(),
                     schriftGr + 2,
@@ -1510,11 +1510,11 @@ void LDiag::render(Image& zRObj)
             dgbr -= vIntervallRB->getHeight();
         }
     }
-    if (hatDatenStyle(DiagDaten::Style::HIntervall) && textRd && schriftGr
+    if (hatDatenStyle(DiagramData::Style::HIntervall) && textRd && schriftGr
         && daten)
     { // rendering of the horizontal interval
         int hIRBbr = innenSize.x;
-        if (hatDatenStyle(DiagDaten::Style::VIntervall)
+        if (hatDatenStyle(DiagramData::Style::VIntervall)
             && daten->vIntervallFarbe)
             hIRBbr -= schriftGr + 2;
         if (hIRBbr > 0)
@@ -1559,12 +1559,12 @@ void LDiag::render(Image& zRObj)
                 for (int i = 0; i < anz; ++i)
                 {
                     txt = "";
-                    if (hatDatenStyle(DiagDaten::Style::HIntervallTexte)
+                    if (hatDatenStyle(DiagramData::Style::HIntervallTexte)
                         && daten->hIntervallTexte
                         && daten->hIntervallTexte->z(rf[i]))
                         txt = daten->hIntervallTexte->z(rf[i])->getText();
                     else if (hatDatenStyleNicht(
-                                 DiagDaten::Style::HIntervallTexte)
+                                 DiagramData::Style::HIntervallTexte)
                              || !daten->hIntervallWerte)
                         txt = daten->hIntervallWerte->get(rf[i]);
                     xPos = (int)(daten->hIntervallWerte->get(rf[i])
@@ -1650,7 +1650,7 @@ void LDiag::render(Image& zRObj)
         dAf->setSize(dgbr - dgrbr * 2, dghi - dgrbr * 2);
         dAf->render(zRObj);
     }
-    if (hatDatenStyle(DiagDaten::Style::Raster) && daten && daten->rasterDicke
+    if (hatDatenStyle(DiagramData::Style::Raster) && daten && daten->rasterDicke
         && daten->rasterBreite && daten->rasterHeight)
     { // Raster
         int maxBr = dgbr;
@@ -1667,7 +1667,7 @@ void LDiag::render(Image& zRObj)
         {
             for (int i = 0; i < daten->rasterDicke; ++i)
             {
-                if (hatDatenStyle(DiagDaten::Style::RasterAlpha))
+                if (hatDatenStyle(DiagramData::Style::RasterAlpha))
                     zRObj.drawLinieVAlpha((int)(x + i),
                         dgy + dgrbr,
                         dghi - dgrbr * 2,
@@ -1687,7 +1687,7 @@ void LDiag::render(Image& zRObj)
         {
             for (int i = 0; i < daten->rasterDicke; ++i)
             {
-                if (hatDatenStyle(DiagDaten::Style::RasterAlpha))
+                if (hatDatenStyle(DiagramData::Style::RasterAlpha))
                     zRObj.drawLinieHAlpha(
                         0, (int)(y + i), dgbr - dgrbr * 2, daten->rasterFarbe);
                 else
@@ -1696,17 +1696,17 @@ void LDiag::render(Image& zRObj)
             }
         }
     }
-    if (daten && daten->werte && daten->werte->getEintragAnzahl()
+    if (daten && daten->werte && daten->werte->getEntryCount()
         && daten->hIntervallBreite && daten->vIntervallHeight)
     { // values
-        int wAnz = daten->werte->getEintragAnzahl();
+        int wAnz = daten->werte->getEntryCount();
         for (int i = 0; i < wAnz; ++i)
         {
-            DiagWert* wert = daten->werte->z(i);
-            if (wert && hatWertStyle(i, DiagWert::Style::Sichtbar)
-                && wert->punkte && wert->punkte->getEintragAnzahl())
+            DiagramValue* wert = daten->werte->z(i);
+            if (wert && hatWertStyle(i, DiagramValue::Style::Sichtbar)
+                && wert->punkte && wert->punkte->getEntryCount())
             {
-                int pAnz = wert->punkte->getEintragAnzahl();
+                int pAnz = wert->punkte->getEntryCount();
                 int* rf = new int[pAnz];
                 bool* fertig = new bool[pAnz];
                 int anz = 0;
@@ -1742,10 +1742,10 @@ void LDiag::render(Image& zRObj)
                     = vertikalScrollBar && hatStyle(Style::VScroll)
                         ? dgy + vertikalScrollBar->getScrollData()->max + dgrbr
                         : dgy + dghi - dgrbr;
-                if (hatWertStyle(i, DiagWert::Style::Hintergrund))
+                if (hatWertStyle(i, DiagramValue::Style::Hintergrund))
                 {
-                    DiagPunkt* vorher = 0;
-                    DiagPunkt* jetzt = 0;
+                    DiagramPoint* vorher = 0;
+                    DiagramPoint* jetzt = 0;
                     for (int j = 0; j < anz; ++j)
                     {
                         jetzt = wert->punkte->get(rf[j]);
@@ -1776,7 +1776,7 @@ void LDiag::render(Image& zRObj)
                                 double y = (double)ay;
                                 ax = ax < 0 ? 0 : ax;
                                 bx = bx > dgbr - dgrbr ? dgbr - dgrbr : bx;
-                                if (hatWertStyle(i, DiagWert::Style::HAlpha))
+                                if (hatWertStyle(i, DiagramValue::Style::HAlpha))
                                 {
                                     for (int x = ax; x < bx; x++, y += yf)
                                         zRObj.drawLinieVAlpha(x,
@@ -1792,7 +1792,7 @@ void LDiag::render(Image& zRObj)
                                             dgmhi - (int)(y + 0.5),
                                             wert->hintergrund);
                                 }
-                                if (hatWertStyle(i, DiagWert::Style::Alpha))
+                                if (hatWertStyle(i, DiagramValue::Style::Alpha))
                                     zRObj.drawLinieAlpha(Punkt(ax, ay),
                                         Punkt(bx, by),
                                         wert->farbe);
@@ -1807,14 +1807,14 @@ void LDiag::render(Image& zRObj)
                 }
                 else
                 {
-                    DiagPunkt* vorher = 0;
-                    DiagPunkt* jetzt = 0;
+                    DiagramPoint* vorher = 0;
+                    DiagramPoint* jetzt = 0;
                     for (int j = 0; j < anz; ++j)
                     {
                         jetzt = wert->punkte->get(rf[j]);
                         if (jetzt && vorher)
                         {
-                            if (hatWertStyle(i, DiagWert::Style::Alpha))
+                            if (hatWertStyle(i, DiagramValue::Style::Alpha))
                                 zRObj.drawLinieAlpha(
                                     Punkt(
                                         (int)(rpx
@@ -1856,18 +1856,18 @@ void LDiag::render(Image& zRObj)
             }
         }
     }
-    if (daten && daten->werte && daten->werte->getEintragAnzahl() && textRd
+    if (daten && daten->werte && daten->werte->getEntryCount() && textRd
         && schriftGr)
     {
-        int wAnz = daten->werte->getEintragAnzahl();
+        int wAnz = daten->werte->getEntryCount();
         int rx = 5;
         int ry = 5;
         textRd->setSchriftSize(schriftGr);
         for (int i = 0; i < wAnz; ++i)
         {
-            DiagWert* w = daten->werte->z(i);
-            if (w && w->name && hatWertStyle(i, DiagWert::Style::Name)
-                && hatWertStyle(i, DiagWert::Style::Sichtbar))
+            DiagramValue* w = daten->werte->z(i);
+            if (w && w->name && hatWertStyle(i, DiagramValue::Style::Name)
+                && hatWertStyle(i, DiagramValue::Style::Sichtbar))
             {
                 int br = textRd->getTextBreite(w->name->getText());
                 zRObj.alphaRegion(rx, ry, br, schriftGr, 0xA0000000);
@@ -1883,70 +1883,70 @@ void LDiag::render(Image& zRObj)
 }
 
 // constant
-Font* LDiag::getFont() const // Returns the font
+Font* BarDiagram::getFont() const // Returns the font
 {
     return textRd ? textRd->getFont() : 0;
 }
 
-Font* LDiag::zFont() const
+Font* BarDiagram::zFont() const
 {
     return textRd ? textRd->zFont() : 0;
 }
 
-Border* LDiag::getDataBorder()
+Border* BarDiagram::getDataBorder()
     const // Returns the inner border around the actual diagram
 {
     return dRam ? dynamic_cast<Border*>(dRam->getThis()) : 0;
 }
 
-Border* LDiag::zDataBorder() const
+Border* BarDiagram::zDataBorder() const
 {
     return dRam;
 }
 
-int LDiag::getDatenRahmenFarbe() const
+int BarDiagram::getDatenRahmenFarbe() const
 {
     return dRam ? dRam->getFarbe() : 0;
 }
 
-int LDiag::getDatenRahmenBreite() const
+int BarDiagram::getDatenRahmenBreite() const
 {
     return dRam ? dRam->getRBreite() : 0;
 }
 
-int LDiag::getDatenHintergrundFarbe()
+int BarDiagram::getDatenHintergrundFarbe()
     const // Returns the background of the actual diagram
 {
     return dBgF;
 }
 
-Image* LDiag::getDatenHintergrundImage() const
+Image* BarDiagram::getDatenHintergrundImage() const
 {
     return dBgB ? dynamic_cast<Image*>(dBgB->getThis()) : 0;
 }
 
-Image* LDiag::zDatenHintergrundImage() const
+Image* BarDiagram::zDatenHintergrundImage() const
 {
     return dBgB;
 }
 
-AlphaFeld*
-LDiag::getDatenAlphaFeld() const // Returns the AlphaFeld of the actual diagram
+AlphaField*
+BarDiagram::getDataAlphaField() const // Returns the AlphaField of the actual diagram
 {
-    return dAf ? dynamic_cast<AlphaFeld*>(dAf->getThis()) : 0;
+    return dAf ? dynamic_cast<AlphaField*>(dAf->getThis()) : 0;
 }
 
-AlphaFeld* LDiag::zDatenAlphaFeld() const
+AlphaField* BarDiagram::zDataAlphaField() const
 {
     return dAf;
 }
 
-int LDiag::getDatenAlphaFeldFarbe() const
+int BarDiagram::getDatenAlphaFeldFarbe() const
 {
     return dAf ? dAf->getFarbe() : 0;
 }
 
-int LDiag::getDatenAlphaFeldStrength() const
+int BarDiagram::getDatenAlphaFeldStrength() const
 {
     return dAf ? dAf->getStrength() : 0;
 }

Diagram.h

@@ -8,17 +8,17 @@
 namespace Framework
 {
     class Border;     //! Border.h
-    class AlphaFeld;  //! AlphaField.h
+    class AlphaField;  //! AlphaField.h
     class Text;       //! Text.h
     class Font;    //! Font.h
     class HScrollBar; //! Scroll.h
     class VScrollBar; //! Scroll.h
-    class SLDiag;     //! from this file
-    class LDiag;      //! from this file
+    class LineDiagram;     //! from this file
+    class BarDiagram;      //! from this file
     class TextRenderer;
 
     //! A 2D GUI Framework drawing that draws a live diagram of values
-    class SLDiag : public DrawableBackground
+    class LineDiagram : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -48,9 +48,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT SLDiag();
+        DLLEXPORT LineDiagram();
         //! Destructor
-        DLLEXPORT virtual ~SLDiag();
+        DLLEXPORT virtual ~LineDiagram();
         //! Sets the used TextRenderer
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
@@ -126,7 +126,7 @@ namespace Framework
     };
 
     //! Point of a value in a diagram
-    struct DiagPunkt
+    struct DiagramPoint
     {
         //! Position of the point on the horizontal interval of the diagram
         double hIntervall;
@@ -135,7 +135,7 @@ namespace Framework
     };
 
     //! Value that is visualized in a diagram
-    struct DiagWert : public virtual ReferenceCounter
+    struct DiagramValue : public virtual ReferenceCounter
     {
         //! Style of a diagram value
         class Style
@@ -164,16 +164,16 @@ namespace Framework
         //! Name of the value
         Text* name;
         //! Points of the value
-        Array<DiagPunkt*>* punkte;
+        Array<DiagramPoint*>* punkte;
 
         //! Constructor
-        DLLEXPORT DiagWert();
+        DLLEXPORT DiagramValue();
         //! Destructor
-        DLLEXPORT ~DiagWert();
+        DLLEXPORT ~DiagramValue();
     };
 
     //! Data for a diagram
-    struct DiagDaten : public virtual ReferenceCounter
+    struct DiagramData : public virtual ReferenceCounter
     {
         class Style
         {
@@ -261,19 +261,19 @@ namespace Framework
         //! by setting AutoIntervallHeight)
         double vIntervallHeight;
         //! Values visualized in the diagram
-        RCArray<DiagWert>* werte;
+        RCArray<DiagramValue>* werte;
 
         //! Constructor
-        DLLEXPORT DiagDaten();
+        DLLEXPORT DiagramData();
         //! Destructor
-        DLLEXPORT ~DiagDaten();
+        DLLEXPORT ~DiagramData();
     };
 
     //! Base class for the different diagram types
-    class BaseDiag
+    class BaseDiagram
     {
     protected:
-        DiagDaten* daten;
+        DiagramData* daten;
         bool changed;
         Critical* lock;
 
@@ -281,15 +281,15 @@ namespace Framework
         //! Constructor
         //! \param lock A pointer to the Critical used to make the diagram class
         //! that inherits from this class thread-safe
-        DLLEXPORT BaseDiag(Critical* lock);
+        DLLEXPORT BaseDiagram(Critical* lock);
         //! Destructor
-        DLLEXPORT virtual ~BaseDiag();
+        DLLEXPORT virtual ~BaseDiagram();
         //! Sets a pointer to the diagram data
         //! \param dd The data
-        DLLEXPORT void setDiagDatenZ(DiagDaten* dd);
+        DLLEXPORT void setDiagramDataZ(DiagramData* dd);
         //! Copies diagram data
         //! \param dd The data
-        DLLEXPORT void setDiagDaten(DiagDaten* dd);
+        DLLEXPORT void setDiagramData(DiagramData* dd);
         //! Sets the grid line thickness
         //! \param d The width of a grid line in pixels
         DLLEXPORT void setRasterDicke(int d);
@@ -327,61 +327,61 @@ namespace Framework
         //! \param name The name
         DLLEXPORT void setVIntervallName(Text* name);
         //! Labels a specific value on the X axis, if the HIntervallTexte flag
-        //! was set in DiagDaten \param hIntervall The value to label
+        //! was set in DiagramData \param hIntervall The value to label
         //! \param text The label
         DLLEXPORT void addHIntervallText(double hIntervall, const char* text);
         //! Labels a specific value on the X axis, if the HIntervallTexte flag
-        //! was set in DiagDaten \param hIntervall The value to label
+        //! was set in DiagramData \param hIntervall The value to label
         //! \param text The label
         DLLEXPORT void addHIntervallText(double hIntervall, Text* text);
         //! Sets a pointer to a label for a specific value on the X axis,
-        //! if the HIntervallTexte flag was set in DiagDaten
+        //! if the HIntervallTexte flag was set in DiagramData
         //! \param hIntervall The value to label
         //! \param text The label
         DLLEXPORT void setHIntervallTextZ(double hIntervall, Text* text);
         //! Changes a label for a specific value on the X axis, if the
-        //! HIntervallTexte flag was set in DiagDaten \param hIntervall The
+        //! HIntervallTexte flag was set in DiagramData \param hIntervall The
         //! value to label \param text The label
         DLLEXPORT void setHIntervallText(double hIntervall, Text* text);
         //! Changes a label for a specific value on the X axis, if the
-        //! HIntervallTexte flag was set in DiagDaten \param hIntervall The
+        //! HIntervallTexte flag was set in DiagramData \param hIntervall The
         //! value to label \param text The label
         DLLEXPORT void setHIntervallText(double hIntervall, const char* text);
         //! Removes a label for a specific value on the X axis,
-        //! if the HIntervallTexte flag was set in DiagDaten \param
+        //! if the HIntervallTexte flag was set in DiagramData \param
         //! hIntervall The value that should no longer be labeled
         DLLEXPORT void removeHIntervallText(double hIntervall);
         //! Labels a specific value on the Y axis, if the VIntervallTexte flag
-        //! was set in DiagDaten \param vIntervall The value to label
+        //! was set in DiagramData \param vIntervall The value to label
         //! \param text The label
         DLLEXPORT void addVIntervallText(double vIntervall, const char* text);
         //! Labels a specific value on the Y axis, if the VIntervallTexte flag
-        //! was set in DiagDaten \param vIntervall The value to label
+        //! was set in DiagramData \param vIntervall The value to label
         //! \param text The label
         DLLEXPORT void addVIntervallText(double vIntervall, Text* text);
         //! Sets a pointer to a label for a specific value on the Y axis,
-        //! if the VIntervallTexte flag was set in DiagDaten
+        //! if the VIntervallTexte flag was set in DiagramData
         //! \param vIntervall The value to label
         //! \param text The label
         DLLEXPORT void setVIntervallTextZ(double vIntervall, Text* text);
         //! Changes a label for a specific value on the Y axis, if the
-        //! VIntervallTexte flag was set in DiagDaten \param vIntervall The
+        //! VIntervallTexte flag was set in DiagramData \param vIntervall The
         //! value to label \param text The label
         DLLEXPORT void setVIntervallText(double vIntervall, Text* text);
         //! Changes a label for a specific value on the Y axis, if the
-        //! VIntervallTexte flag was set in DiagDaten \param vIntervall The
+        //! VIntervallTexte flag was set in DiagramData \param vIntervall The
         //! value to label \param text The label
         DLLEXPORT void setVIntervallText(double vIntervall, const char* text);
         //! Removes a label for a specific value on the Y axis,
-        //! if the VIntervallTexte flag was set in DiagDaten \param
+        //! if the VIntervallTexte flag was set in DiagramData \param
         //! vIntervall The value that should no longer be labeled
         DLLEXPORT void removeVIntervallText(double vIntervall);
         //! Adds a value (graph) displayed in the diagram
         //! \param w The new value
-        DLLEXPORT void addWertZ(DiagWert* w);
+        DLLEXPORT void addWertZ(DiagramValue* w);
         //! Adds a value (graph) displayed in the diagram by copying
         //! another \param w The value to copy
-        DLLEXPORT void addWert(DiagWert* w);
+        DLLEXPORT void addWert(DiagramValue* w);
         //! Adds a value (graph) displayed in the diagram
         //! \param name The name of the value
         DLLEXPORT void addWert(const char* name);
@@ -395,11 +395,11 @@ namespace Framework
         //! Adds a point to a value
         //! \param wNum The index of the value
         //! \param p The new point
-        DLLEXPORT void addPunktZ(int wNum, DiagPunkt* p);
+        DLLEXPORT void addPunktZ(int wNum, DiagramPoint* p);
         //! Adds a point to a value by copying a point
         //! \param wNum The index of the value
         //! \param p The point to copy
-        DLLEXPORT void addPunkt(int wNum, DiagPunkt* p);
+        DLLEXPORT void addPunkt(int wNum, DiagramPoint* p);
         //! Adds a point to a value
         //! \param wNum The index of the value
         //! \param hI The value of the point on the X axis
@@ -409,11 +409,11 @@ namespace Framework
         //! \param wNum The index of the value
         //! \param hI The X axis value of the point to replace
         //! \param p The new point
-        DLLEXPORT void setPunktZ(int wNum, double hI, DiagPunkt* p);
+        DLLEXPORT void setPunktZ(int wNum, double hI, DiagramPoint* p);
         //! Sets an existing point of a value by copying a point
         //! \param wNum The index of the value \param hI The X axis value of
         //! the point to replace \param p The new point
-        DLLEXPORT void setPunkt(int wNum, double hI, DiagPunkt* p);
+        DLLEXPORT void setPunkt(int wNum, double hI, DiagramPoint* p);
         //! Sets an existing point of a value
         //! \param wNum The index of the value
         //! \param hI The X axis value of the point to replace
@@ -424,11 +424,11 @@ namespace Framework
         //! \param wNum The index of the value
         //! \param pNum The index of the point in the value
         //! \param p The new point
-        DLLEXPORT void setPunktZ(int wNum, int pNum, DiagPunkt* p);
+        DLLEXPORT void setPunktZ(int wNum, int pNum, DiagramPoint* p);
         //! Sets an existing point of a value by copying a point
         //! \param wNum The index of the value \param pNum The index of the
         //! point in the value \param p The new point
-        DLLEXPORT void setPunkt(int wNum, int pNum, DiagPunkt* p);
+        DLLEXPORT void setPunkt(int wNum, int pNum, DiagramPoint* p);
         //! Sets an existing point of a value
         //! \param wNum The index of the value
         //! \param pNum The index of the point in the value
@@ -452,18 +452,18 @@ namespace Framework
         //! Removes a value
         //! \param name The name of the value
         DLLEXPORT void removeWert(Text* name);
-        //! Adds styles to the DiagDaten
+        //! Adds styles to the DiagramData
         //! \param style The new styles
         DLLEXPORT void addDatenStyle(int style);
-        //! Sets the styles of the DiagDaten
+        //! Sets the styles of the DiagramData
         //! \param style The new styles
         DLLEXPORT void setDatenStyle(int style);
-        //! Sets the styles of the DiagDaten
+        //! Sets the styles of the DiagramData
         //! \param style The styles
         //! \param addRemove 1 if the styles should be added. 0 if the styles
         //! should be removed
         DLLEXPORT void setDatenStyle(int style, bool addRemove);
-        //! Removes styles from the DiagDaten
+        //! Removes styles from the DiagramData
         //! \param style The styles to remove
         DLLEXPORT void removeDatenStyle(int style);
         //! Adds styles to a specific value
@@ -485,36 +485,36 @@ namespace Framework
         //! \param style The styles to remove
         DLLEXPORT void removeWertStyle(int wNum, int style);
         //! Returns the diagram data
-        DLLEXPORT DiagDaten* getDiagDaten() const;
+        DLLEXPORT DiagramData* getDiagramData() const;
         //! Returns the diagram data without increased reference counter
-        DLLEXPORT DiagDaten* zDiagDaten() const;
+        DLLEXPORT DiagramData* zDiagramData() const;
         //! Returns the data of a value
         //! \param wNum The index of the value
-        DLLEXPORT DiagWert* getDiagWert(int wNum) const;
+        DLLEXPORT DiagramValue* getDiagramValue(int wNum) const;
         //! Returns the data of a value without increased reference counter
         //! \param wNum The index of the value
-        DLLEXPORT DiagWert* zDiagWert(int wNum) const;
+        DLLEXPORT DiagramValue* zDiagramValue(int wNum) const;
         //! Returns the data of a value
         //! \param name The name of the value
-        DLLEXPORT DiagWert* getDiagWert(const char* name) const;
+        DLLEXPORT DiagramValue* getDiagramValue(const char* name) const;
         //! Returns the data of a value without increased reference counter
         //! \param name The name of the value
-        DLLEXPORT DiagWert* zDiagWert(const char* name) const;
+        DLLEXPORT DiagramValue* zDiagramValue(const char* name) const;
         //! Returns the index of a value
         //! \param name The name of the value
-        DLLEXPORT int getDiagWertPos(const char* name) const;
+        DLLEXPORT int getDiagramValuePos(const char* name) const;
         //! Returns the index of a point from a value
         //! \param wNum The index of the value
         //! \param hI The X axis value of the point
-        DLLEXPORT int getDiagPunktPos(int wNum, double hI) const;
+        DLLEXPORT int getDiagramPointPos(int wNum, double hI) const;
         //! Returns the index of a point from a value
         //! \param wName The name of the value
         //! \param hI The X axis value of the point
-        DLLEXPORT int getDiagPunktPos(char* wName, double hI) const;
-        //! Checks whether specific styles are set in the DiagDaten
+        DLLEXPORT int getDiagramPointPos(char* wName, double hI) const;
+        //! Checks whether specific styles are set in the DiagramData
         //! \param style The styles
         DLLEXPORT inline bool hatDatenStyle(int style) const;
-        //! Checks whether specific styles are not set in the DiagDaten
+        //! Checks whether specific styles are not set in the DiagramData
         //! \param style The styles
         DLLEXPORT inline bool hatDatenStyleNicht(int style) const;
         //! Checks whether specific styles are set for a specific value
@@ -528,8 +528,8 @@ namespace Framework
 
     //! A 2D GUI Framework drawing that displays diagram data as
     //! line graphs
-    class LDiag : public DrawableBackground,
-                  public BaseDiag
+    class BarDiagram : public DrawableBackground,
+                  public BaseDiagram
     {
     public:
         class Style : public DrawableBackground::Style
@@ -558,19 +558,19 @@ namespace Framework
         Border* dRam;
         int dBgF;
         Image* dBgB;
-        AlphaFeld* dAf;
+        AlphaField* dAf;
         Image* vIntervallRB;
         Image* hIntervallRB;
         int schriftGr;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
-        DLLEXPORT LDiag();
+        DLLEXPORT BarDiagram();
         //! Destructor
-        DLLEXPORT virtual ~LDiag();
+        DLLEXPORT virtual ~BarDiagram();
         //! Sets the used TextRenderer
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
@@ -598,11 +598,11 @@ namespace Framework
         DLLEXPORT void setDatenHintergrundImage(Image* b);
         //! Sets the color gradient of the actual diagram (color gradient of
         //! the data) \param af The color gradient
-        DLLEXPORT void setDatenAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setDataAlphaFieldZ(AlphaField* af);
         //! Sets the color gradient of the actual diagram (color gradient of
         //! the data) by copying a color gradient \param af The color
         //! gradient to copy
-        DLLEXPORT void setDatenAlphaFeld(AlphaFeld* af);
+        DLLEXPORT void setDataAlphaField(AlphaField* af);
         //! Sets the color of the color gradient of the actual diagram
         //! (color gradient of the data) \param fc The color in A8R8G8B8 format
         DLLEXPORT void setDatenAlphaFeldFarbe(int fc);
@@ -639,10 +639,10 @@ namespace Framework
         DLLEXPORT Image* zDatenHintergrundImage() const;
         //! Returns the color gradient of the actual diagram
         //! (color gradient of the data)
-        DLLEXPORT AlphaFeld* getDatenAlphaFeld() const;
+        DLLEXPORT AlphaField* getDataAlphaField() const;
         //! Returns the color gradient of the actual diagram without increased
         //! reference counter (color gradient of the data)
-        DLLEXPORT AlphaFeld* zDatenAlphaFeld() const;
+        DLLEXPORT AlphaField* zDataAlphaField() const;
         //! Returns the color of the color gradient of the actual diagram in
         //! A8R8G8B8 format (color gradient of the data)
         DLLEXPORT int getDatenAlphaFeldFarbe() const;

Dialog.cpp

@@ -57,7 +57,7 @@ void* MultiplChoiceDialog::anzeigen(Font* zFont)
     r->setScreen(dynamic_cast<Screen*>(b->getThis()));
     r->beginn();
 
-    AuswahlBox* ab = new AuswahlBox();
+    SelectionBox* ab = new SelectionBox();
     ab->setPosition(10, 10);
     ab->setSize(180, 20);
     ab->setHintergrundFarbe(0xFF000000);
@@ -66,27 +66,27 @@ void* MultiplChoiceDialog::anzeigen(Font* zFont)
     ab->setMaxAuskappHeight(120);
     ab->setMausRahmenBreite(1);
     ab->setMausRahmenFarbe(0xFF005500);
-    ab->setMausAlphaFeldFarbe(0x00008700);
+    ab->setMouseAlphaFieldColor(0x00008700);
     ab->setMausAlphaFeldStrength(-8);
     ab->setAuswRahmenBreite(1);
     ab->setAuswRahmenFarbe(0xFF00FF00);
-    ab->setAuswAlphaFeldFarbe(0x0000FF00);
+    ab->setSelAlphaFieldColor(0x0000FF00);
     ab->setAuswAlphaFeldStrength(-8);
-    ab->setStyle(AuswahlBox::Style::Normal);
+    ab->setStyle(SelectionBox::Style::Normal);
     ab->setFontZ(dynamic_cast<Font*>(zFont->getThis()));
     for (Text* i : *entrys)
         ab->addEintrag(i->getText());
-    ab->setMausEreignis(_ret1ME);
+    ab->setMouseEvent(_ret1ME);
     b->addMember(ab);
 
-    Knopf* ok = new Knopf();
-    ok->setStyle(Knopf::Style::Normal);
+    Button* ok = new Button();
+    ok->setStyle(Button::Style::Normal);
     ok->setPosition(50, 150);
     ok->setSize(100, 20);
     ok->setFontZ(dynamic_cast<Font*>(zFont->getThis()));
     ok->setText("Ok");
-    ok->setMausEreignis(
-        [this, &ex, &result, ab](void* p, void* o, MausEreignis me) {
+    ok->setMouseEvent(
+        [this, &ex, &result, ab](void* p, void* o, MouseEvent me) {
             if (me.id == ME_RLinks)
             {
                 result = ids->get(ab->getAuswahl());

Drawing.cpp

@@ -47,7 +47,7 @@ Drawable::~Drawable()
     if (toolTip) toolTip->release();
 }
 
-void Drawable::doMausEreignis(MausEreignis& me, bool userRet)
+void Drawable::doMouseEvent(MouseEvent& me, bool userRet)
 {
     me.verarbeitet = userRet;
 }
@@ -116,24 +116,24 @@ void Drawable::unlockDrawable()
     cs.unlock();
 }
 
-void Drawable::setMausEreignisParameter(
+void Drawable::setMouseEventParameter(
     void* p) // sets the mouse event parameter
 {
     makParam = p;
 }
 
-void Drawable::setTastaturEreignisParameter(
+void Drawable::setKeyboardEventParameter(
     void* p) // sets the keyboard event parameter
 {
     takParam = p;
 }
 
-void Drawable::setMausEreignis(MausAktion ak) // sets the mouse event
+void Drawable::setMouseEvent(MausAktion ak) // sets the mouse event
 {
     mak = ak;
 }
 
-void Framework::Drawable::addMausEreignis(MausAktion ak)
+void Framework::Drawable::addMouseEvent(MausAktion ak)
 {
     if (!mak)
     {
@@ -142,19 +142,19 @@ void Framework::Drawable::addMausEreignis(MausAktion ak)
     else
     {
         MausAktion old = mak;
-        mak = [old, ak](void* p, void* o, MausEreignis me) {
+        mak = [old, ak](void* p, void* o, MouseEvent me) {
             return old(p, o, me) && ak(p, o, me);
         };
     }
 }
 
-void Drawable::setTastaturEreignis(
+void Drawable::setKeyboardEvent(
     TastaturAktion ak) // sets the keyboard event
 {
     tak = ak;
 }
 
-void Framework::Drawable::addTastaturEreignis(TastaturAktion ak)
+void Framework::Drawable::addKeyboardEvent(TastaturAktion ak)
 {
     if (!tak)
     {
@@ -163,36 +163,36 @@ void Framework::Drawable::addTastaturEreignis(TastaturAktion ak)
     else
     {
         TastaturAktion old = tak;
-        tak = [old, ak](void* p, void* o, TastaturEreignis te) {
+        tak = [old, ak](void* p, void* o, KeyboardEvent te) {
             return old(p, o, te) && ak(p, o, te);
         };
     }
 }
 
-void Drawable::setNMausEreignisParameter(
+void Drawable::setNMouseEventParameter(
     void* p) // sets the mouse event parameter
 {
     nmakParam = p;
 }
 
-void Drawable::setNTastaturEreignisParameter(
+void Drawable::setNKeyboardEventParameter(
     void* p) // sets the keyboard event parameter
 {
     ntakParam = p;
 }
 
-void Drawable::setNMausEreignis(MausAktion ak) // sets the mouse event
+void Drawable::setNMouseEvent(MausAktion ak) // sets the mouse event
 {
     nMak = ak;
 }
 
-void Drawable::setNTastaturEreignis(
+void Drawable::setNKeyboardEvent(
     TastaturAktion ak) // sets the keyboard event
 {
     nTak = ak;
 }
 
-void Drawable::doPublicMausEreignis(MausEreignis& me) // calls Mak
+void Drawable::doPublicMouseEvent(MouseEvent& me) // calls Mak
 {
     bool lock = hatStyle(Style::MELockDrawable);
     if (lock) lockDrawable();
@@ -203,14 +203,14 @@ void Drawable::doPublicMausEreignis(MausEreignis& me) // calls Mak
         {
             mausIn = 0;
             if (toolTip) toolTip->setMausIn(0);
-            MausEreignis me2;
+            MouseEvent me2;
             me2.id = ME_Leaves;
             me2.mx = me.mx - pos.x;
             me2.my = me.my - pos.y;
             me2.verarbeitet = 0;
             me2.insideParent = me.insideParent;
             bool userRet = mak && mak(makParam, this, me2);
-            doMausEreignis(me2, userRet);
+            doMouseEvent(me2, userRet);
         }
     }
     if (!inside && me.id == ME_PLinks) removeStyle(Style::Fokus);
@@ -234,14 +234,14 @@ void Drawable::doPublicMausEreignis(MausEreignis& me) // calls Mak
             toolTipRequested
                 = onNeedToolTip(this, Punkt(me.mx - pos.x, me.my - pos.y));
         }
-        MausEreignis me2;
+        MouseEvent me2;
         me2.id = ME_Betritt;
         me2.mx = me.mx - pos.x;
         me2.my = me.my - pos.y;
         me2.verarbeitet = 0;
         me2.insideParent = 1;
         bool userRet = mak && mak(makParam, this, me2);
-        doMausEreignis(me2, userRet);
+        doMouseEvent(me2, userRet);
     }
     else if (me.insideParent && mausIn && me.id != ME_Leaves && inside
              && !me.verarbeitet && hatStyle(Style::Sichtbar) && !toolTip
@@ -258,7 +258,7 @@ void Drawable::doPublicMausEreignis(MausEreignis& me) // calls Mak
                     && (me.verarbeitet || !me.insideParent
                         || (inside && mak && mak(makParam, this, me)));
         bool vera = me.verarbeitet;
-        doMausEreignis(me, userRet);
+        doMouseEvent(me, userRet);
         if (nMak && me.verarbeitet && !vera && hatStyle(Style::Erlaubt)
             && me.insideParent && inside)
             me.verarbeitet = nMak(nmakParam, this, me);
@@ -267,7 +267,7 @@ void Drawable::doPublicMausEreignis(MausEreignis& me) // calls Mak
     if (lock) unlockDrawable();
 }
 
-void Drawable::doTastaturEreignis(TastaturEreignis& te) // calls Tak
+void Drawable::doKeyboardEvent(KeyboardEvent& te) // calls Tak
 {
     if (te.verarbeitet) return;
     if (tak) te.verarbeitet |= tak(takParam, this, te);
@@ -396,12 +396,12 @@ void Drawable::render(Image& zRObj)
 }
 
 // constant
-bool Drawable::hatMausEreignis() const // checks if Mak is set
+bool Drawable::hasMouseEvent() const // checks if Mak is set
 {
     return mak != 0;
 }
 
-bool Drawable::hatTastaturEreignis() const // checks if Tak is set
+bool Drawable::hasKeyboardEvent() const // checks if Tak is set
 {
     return tak != 0;
 }
@@ -496,10 +496,10 @@ Drawable* Drawable::dublizieren() const // Creates a copy of the drawing
     Drawable* obj = new Drawable();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     return obj;
 }
@@ -531,7 +531,7 @@ DrawableBackground::~DrawableBackground()
     if (vertikalScrollBar) vertikalScrollBar->release();
 }
 
-void DrawableBackground::doMausEreignis(MausEreignis& me, bool userRet)
+void DrawableBackground::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (userRet)
     {
@@ -588,8 +588,8 @@ void DrawableBackground::setHintergrundFarbe(
     }
 }
 
-void DrawableBackground::setAlphaFeldZ(
-    AlphaFeld* buff) // sets a pointer to the background buffer
+void DrawableBackground::setAlphaFieldZ(
+    AlphaField* buff) // sets a pointer to the background buffer
 {
     if (hintergrundFeld != buff)
     {
@@ -599,12 +599,12 @@ void DrawableBackground::setAlphaFeldZ(
     }
 }
 
-void DrawableBackground::setAlphaFeldStrength(
+void DrawableBackground::setAlphaFieldStrength(
     int st) // sets the strength of the background buffer
 {
     if (!hintergrundFeld)
     {
-        hintergrundFeld = new AlphaFeld();
+        hintergrundFeld = new AlphaField();
         rend = 1;
     }
     if (hintergrundFeld->getStrength() != st)
@@ -614,12 +614,12 @@ void DrawableBackground::setAlphaFeldStrength(
     }
 }
 
-void DrawableBackground::setAlphaFeldFarbe(
+void DrawableBackground::setAlphaFieldColor(
     int fc) // sets the color of the background buffer
 {
     if (!hintergrundFeld)
     {
-        hintergrundFeld = new AlphaFeld();
+        hintergrundFeld = new AlphaField();
         rend = 1;
     }
     if (hintergrundFeld->getFarbe() != fc)
@@ -927,27 +927,27 @@ int DrawableBackground::getHintergrundFarbe()
     return hintergrundFarbe;
 }
 
-AlphaFeld*
-DrawableBackground::getAlphaFeld() const // returns the background buffer
+AlphaField*
+DrawableBackground::getAlphaField() const // returns the background buffer
 {
     if (!hintergrundFeld) return 0;
-    return dynamic_cast<AlphaFeld*>(hintergrundFeld->getThis());
+    return dynamic_cast<AlphaField*>(hintergrundFeld->getThis());
 }
 
-AlphaFeld* DrawableBackground::zAlphaFeld()
+AlphaField* DrawableBackground::zAlphaField()
     const // returns the background buffer without increased reference counter
 {
     return hintergrundFeld;
 }
 
-int DrawableBackground::getAlphaFeldStrength()
+int DrawableBackground::getAlphaFieldStrength()
     const // returns the strength of the background buffer
 {
     if (!hintergrundFeld) return 0;
     return hintergrundFeld->getStrength();
 }
 
-int DrawableBackground::getAlphaFeldFarbe()
+int DrawableBackground::getAlphaFieldColor()
     const // returns the color of the background buffer
 {
     return hintergrundFeld->getFarbe();
@@ -1022,15 +1022,15 @@ DrawableBackground::dublizieren() const // Creates a copy of the drawing
     DrawableBackground* obj = new DrawableBackground();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStyle(style);
     obj->setHintergrundFarbe(hintergrundFarbe);
     if (hintergrundFeld)
-        obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
+        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
     if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
     if (hintergrundImage)
         obj->setHintergrundImage(

Drawing.h

@@ -11,14 +11,14 @@
 
 namespace Framework
 {
-    struct MausEreignis;     //! MouseEvent.h
-    struct TastaturEreignis; //! KeyboardEvent.h
+    struct MouseEvent;     //! MouseEvent.h
+    struct KeyboardEvent; //! KeyboardEvent.h
     class Image;              //! Image.h
     class Drawable;         //! From this file
     class ToolTip;           //! ToolTip.h
     class Screen;        //! Screen.h
     class Border;            //! Border.h
-    class AlphaFeld;         //! AlphaField.h
+    class AlphaField;         //! AlphaField.h
     class VScrollBar;        //! Scroll.h
     class HScrollBar;        //! Scroll.h
     class Font;
@@ -74,8 +74,8 @@ namespace Framework
 
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The mouse event \param userRet true if
-        //! MausEreignis::verarbeitet should be set to true
-        DLLEXPORT virtual void doMausEreignis(MausEreignis& me, bool userRet);
+        //! MouseEvent::verarbeitet should be set to true
+        DLLEXPORT virtual void doMouseEvent(MouseEvent& me, bool userRet);
 
     public:
         //! Constructor
@@ -109,22 +109,22 @@ namespace Framework
         DLLEXPORT void unlockDrawable();
         //! Sets the parameter passed to the callback function on a mouse event
         //! \param p The parameter
-        DLLEXPORT void setMausEreignisParameter(void* p);
+        DLLEXPORT void setMouseEventParameter(void* p);
         //! Sets the parameter passed to the callback function on a keyboard event
         //! \param p The parameter
-        DLLEXPORT void setTastaturEreignisParameter(void* p);
+        DLLEXPORT void setKeyboardEventParameter(void* p);
         //! Sets the callback function to be called on a mouse event.
         //! If the callback returns 0, or was not set, the mouse event
         //! is not further processed by the drawing. The standard function
         //! __ret1ME can be used, which is defined in MouseEvent.h and always
         //! returns 1 \param ak A pointer to the callback function
-        DLLEXPORT void setMausEreignis(MausAktion ak);
+        DLLEXPORT void setMouseEvent(MausAktion ak);
         //! Adds a callback function to be called on a mouse event.
         //! If any callback returns 0, or none was set, the mouse event
         //! is not further processed by the drawing. The standard function
         //! __ret1ME can be used, which is defined in MouseEvent.h and always
         //! returns 1 \param ak A pointer to the callback function
-        DLLEXPORT void addMausEreignis(MausAktion ak);
+        DLLEXPORT void addMouseEvent(MausAktion ak);
         //! Sets the callback function to be called on a keyboard event.
         //! If the callback returns 0, or was not set, the keyboard event
         //! is not further processed by the drawing. The standard function
@@ -132,7 +132,7 @@ namespace Framework
         //! always returns 1. Other standard functions are _nurNummernTE and
         //! _nurHexTE also from KeyboardEvent.h \param ak A pointer to
         //! the callback function
-        DLLEXPORT void setTastaturEreignis(TastaturAktion ak);
+        DLLEXPORT void setKeyboardEvent(TastaturAktion ak);
         //! Adds a callback function to be called on a keyboard event.
         //! If any callback returns 0, or none was set, the keyboard event
         //! is not further processed by the drawing. The standard function
@@ -140,22 +140,22 @@ namespace Framework
         //! always returns 1. Other standard functions are _nurNummernTE and
         //! _nurHexTE also from KeyboardEvent.h \param ak A pointer to
         //! the callback function
-        DLLEXPORT void addTastaturEreignis(TastaturAktion ak);
+        DLLEXPORT void addKeyboardEvent(TastaturAktion ak);
         //! Sets the parameter passed to the callback function on a mouse event
         //! that is called after the event was processed by the drawing
         //! \param p The parameter
-        DLLEXPORT void setNMausEreignisParameter(void* p);
+        DLLEXPORT void setNMouseEventParameter(void* p);
         //! Sets the parameter passed to the callback function on a keyboard
         //! event that is called after the event was processed by the drawing
         //! \param p The parameter
-        DLLEXPORT void setNTastaturEreignisParameter(void* p);
+        DLLEXPORT void setNKeyboardEventParameter(void* p);
         //! Sets the callback function to be called on a mouse event after
         //! the event has already been processed by the drawing. If the callback
         //! returns 1, or was not set, the mouse event will not be processed
         //! by any other drawing, such as ones behind this drawing. The standard
         //! function __ret1ME can be used, which is defined in MouseEvent.h
         //! and always returns 1 \param ak A pointer to the callback function
-        DLLEXPORT void setNMausEreignis(MausAktion ak);
+        DLLEXPORT void setNMouseEvent(MausAktion ak);
         //! Sets the callback function to be called on a keyboard event after
         //! the event has already been processed by the drawing. If the callback
         //! returns 1, or was not set, the keyboard event will not be processed
@@ -163,13 +163,13 @@ namespace Framework
         //! which is defined in KeyboardEvent.h and always returns 1. Other
         //! standard functions are _nurNummernTE and _nurHexTE also from
         //! KeyboardEvent.h \param ak A pointer to the callback function
-        DLLEXPORT void setNTastaturEreignis(TastaturAktion ak);
+        DLLEXPORT void setNKeyboardEvent(TastaturAktion ak);
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The event
-        DLLEXPORT virtual void doPublicMausEreignis(MausEreignis& me);
+        DLLEXPORT virtual void doPublicMouseEvent(MouseEvent& me);
         //! Processes a keyboard event. Called automatically by the framework
         //! \param te The event
-        DLLEXPORT virtual void doTastaturEreignis(TastaturEreignis& te);
+        DLLEXPORT virtual void doKeyboardEvent(KeyboardEvent& te);
         //! Processes the time elapsed since the last call of this function
         //! \param tickVal The elapsed time in seconds
         DLLEXPORT virtual bool tick(double tickval);
@@ -218,9 +218,9 @@ namespace Framework
         //! \param zRObj The image to draw into
         DLLEXPORT virtual void render(Image& zRObj);
         //! Returns whether a callback function for mouse events was set
-        DLLEXPORT bool hatMausEreignis() const;
+        DLLEXPORT bool hasMouseEvent() const;
         //! Returns whether a callback function for keyboard events was set
-        DLLEXPORT bool hatTastaturEreignis() const;
+        DLLEXPORT bool hasKeyboardEvent() const;
         //! Returns the position of the drawing in pixels
         DLLEXPORT const Punkt& getPosition() const;
         //! Returns the size of the drawing in pixels. x for width and y
@@ -299,7 +299,7 @@ namespace Framework
         int hintergrundFarbe;
         Border* rahmen;
         Image* hintergrundImage;
-        AlphaFeld* hintergrundFeld;
+        AlphaField* hintergrundFeld;
         VScrollBar* vertikalScrollBar;
         HScrollBar* horizontalScrollBar;
         Punkt innenPosition;
@@ -308,7 +308,7 @@ namespace Framework
     protected:
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
@@ -325,17 +325,17 @@ namespace Framework
         //! Sets the background color (requires drawing flag:
         //! Style::Hintergrund) \param fc The background color in A8R8G8B8 format
         DLLEXPORT void setHintergrundFarbe(int fc);
-        //! Sets a pointer to the AlphaFeld (requires drawing flag:
-        //! Style::Buffered) \param buff The AlphaFeld to draw over the background
-        DLLEXPORT void setAlphaFeldZ(AlphaFeld* buff);
-        //! Sets the strength of the AlphaFeld (requires drawing flag:
-        //! Style::Buffered) \param st The strength of the AlphaFeld drawn
+        //! Sets a pointer to the AlphaField (requires drawing flag:
+        //! Style::Buffered) \param buff The AlphaField to draw over the background
+        DLLEXPORT void setAlphaFieldZ(AlphaField* buff);
+        //! Sets the strength of the AlphaField (requires drawing flag:
+        //! Style::Buffered) \param st The strength of the AlphaField drawn
         //! over the background
-        DLLEXPORT void setAlphaFeldStrength(int st);
-        //! Sets the color of the AlphaFeld (requires drawing flag:
-        //! Style::Buffered) \param fc The color of the AlphaFeld drawn
+        DLLEXPORT void setAlphaFieldStrength(int st);
+        //! Sets the color of the AlphaField (requires drawing flag:
+        //! Style::Buffered) \param fc The color of the AlphaField drawn
         //! over the background
-        DLLEXPORT void setAlphaFeldFarbe(int fc);
+        DLLEXPORT void setAlphaFieldColor(int fc);
         //! Sets a pointer to the line border drawn around the text field
         //! (requires drawing flag: Style::Border)
         //! \param ram The border
@@ -385,16 +385,16 @@ namespace Framework
         DLLEXPORT Image* zHintergrundImage() const;
         //! Returns the background color in A8R8G8B8 format
         DLLEXPORT int getHintergrundFarbe() const;
-        //! Returns the AlphaFeld drawn over the background.
-        //! \return 0 if the AlphaFeld was not defined
-        DLLEXPORT AlphaFeld* getAlphaFeld() const;
-        //! Returns the AlphaFeld without increased reference counter drawn
-        //! over the background. \return 0 if the AlphaFeld was not defined
-        DLLEXPORT AlphaFeld* zAlphaFeld() const;
-        //! Returns the strength of the AlphaFeld
-        DLLEXPORT int getAlphaFeldStrength() const;
-        //! Returns the color of the AlphaFeld in A8R8G8B8 format
-        DLLEXPORT int getAlphaFeldFarbe() const;
+        //! Returns the AlphaField drawn over the background.
+        //! \return 0 if the AlphaField was not defined
+        DLLEXPORT AlphaField* getAlphaField() const;
+        //! Returns the AlphaField without increased reference counter drawn
+        //! over the background. \return 0 if the AlphaField was not defined
+        DLLEXPORT AlphaField* zAlphaField() const;
+        //! Returns the strength of the AlphaField
+        DLLEXPORT int getAlphaFieldStrength() const;
+        //! Returns the color of the AlphaField in A8R8G8B8 format
+        DLLEXPORT int getAlphaFieldColor() const;
         //! Returns the border
         //! \return 0 if no border was defined
         DLLEXPORT Border* getBorder() const;

Drawing3D.cpp

@@ -135,11 +135,11 @@ int Drawable3D::errechneMatrizen(
 
 // Processes a mouse event
 //  me: The mouse event to be processed
-void Drawable3D::doMausEreignis(MausEreignis3D& me) {}
+void Drawable3D::doMouseEvent(MouseEvent3D& me) {}
 
 // Processes a keyboard event
 //  te: The keyboard event to be processed
-void Drawable3D::doTastaturEreignis(TastaturEreignis& te) {}
+void Drawable3D::doKeyboardEvent(KeyboardEvent& te) {}
 
 // Processes the elapsed time
 //  tickval: The time in seconds since the last call of the function

Drawing3D.h

@@ -5,8 +5,8 @@
 
 namespace Framework
 {
-    struct MausEreignis3D;
-    struct TastaturEreignis;
+    struct MouseEvent3D;
+    struct KeyboardEvent;
     class Render3D; //! Render3D.h
 
     //! An object that can be drawn by the Screen3D class.
@@ -73,10 +73,10 @@ namespace Framework
             const Mat4<float>& viewProj, Mat4<float>* matBuffer);
         //! Processes a mouse event
         //! \param me The mouse event to process
-        DLLEXPORT virtual void doMausEreignis(MausEreignis3D& me);
+        DLLEXPORT virtual void doMouseEvent(MouseEvent3D& me);
         //! Processes a keyboard event
         //! \param te The keyboard event to process
-        DLLEXPORT virtual void doTastaturEreignis(TastaturEreignis& te);
+        DLLEXPORT virtual void doKeyboardEvent(KeyboardEvent& te);
         //! Processes elapsed time
         //! \param tickval The time in seconds since the last call of this
         //! function \return true if the object changed, false otherwise.

Field.h

@@ -8,11 +8,11 @@
 
 namespace Framework
 {
-    class Feld
+    class Field
     {
     private:
         Text name;
-        Typ typ;
+        Type typ;
         Sichtbarkeit sichtbarkeit;
         std::vector<std::pair<Text, Text>> annotations;
     };

File.cpp

@@ -16,9 +16,9 @@
 using namespace Framework;
 using namespace Encryption;
 
-// Content of the Datei class from File.h
+// Content of the File class from File.h
 // Constructor
-Datei::Datei()
+File::File()
     : ReferenceCounter(),
       stream(0),
       pfad(0),
@@ -31,21 +31,21 @@ Datei::Datei()
 {}
 
 //! Constructor
-Datei::Datei(const char* pfad)
-    : Datei()
+File::File(const char* pfad)
+    : File()
 {
-    setDatei(pfad);
+    setFile(pfad);
 }
 
 //! Constructor
-Datei::Datei(Text* pfad)
-    : Datei()
+File::File(Text* pfad)
+    : File()
 {
-    setDatei(pfad);
+    setFile(pfad);
 }
 
 // Destructor
-Datei::~Datei()
+File::~File()
 {
     if (key) key->release();
     if (stream) delete stream;
@@ -53,7 +53,7 @@ Datei::~Datei()
 }
 
 // non-constant
-void Datei::setDatei(const char* pfad) // sets the file
+void File::setFile(const char* pfad) // sets the file
 {
     if (istOffen()) close();
     if (!this->pfad) this->pfad = new Text();
@@ -61,7 +61,7 @@ void Datei::setDatei(const char* pfad) // sets the file
     gr = 0;
 }
 
-void Datei::setDatei(Text* pfad)
+void File::setFile(Text* pfad)
 {
     if (istOffen()) close();
     if (!this->pfad) this->pfad = new Text();
@@ -70,10 +70,10 @@ void Datei::setDatei(Text* pfad)
     gr = 0;
 }
 
-bool Datei::umbenennen(const char* pfad) // renames and possibly moves the file
+bool File::umbenennen(const char* pfad) // renames and possibly moves the file
 {
     if (!pfad) return 0;
-    if (DateiUmbenennen(this->pfad->getText(), pfad))
+    if (FileRename(this->pfad->getText(), pfad))
     {
         this->pfad->setText(pfad);
         return 1;
@@ -81,14 +81,14 @@ bool Datei::umbenennen(const char* pfad) // renames and possibly moves the file
     return 0;
 }
 
-bool Datei::umbenennen(Text* pfad)
+bool File::umbenennen(Text* pfad)
 {
     if (!this->pfad)
     {
         pfad->release();
         return 0;
     }
-    if (DateiUmbenennen(this->pfad->getText(), pfad->getText()))
+    if (FileRename(this->pfad->getText(), pfad->getText()))
     {
         this->pfad->setText(*pfad);
         pfad->release();
@@ -98,19 +98,19 @@ bool Datei::umbenennen(Text* pfad)
     return 0;
 }
 
-bool Datei::remove() // deletes the file
+bool File::remove() // deletes the file
 {
     if (!pfad) return 0;
-    return DateiRemove(dynamic_cast<Text*>(pfad->getThis()));
+    return FileRemove(dynamic_cast<Text*>(pfad->getThis()));
 }
 
-bool Datei::erstellen() // creates the file
+bool File::erstellen() // creates the file
 {
     if (!pfad) return 0;
-    return DateiPfadErstellen(dynamic_cast<Text*>(pfad->getThis()));
+    return FilePathCreate(dynamic_cast<Text*>(pfad->getThis()));
 }
 
-bool Datei::open(int style) // opens the file
+bool File::open(int style) // opens the file
 {
     if (!pfad) return 0;
     if (stream) delete stream;
@@ -136,7 +136,7 @@ bool Datei::open(int style) // opens the file
     return 1;
 }
 
-void Datei::setLPosition(__int64 pos, bool ende) // sets the read position
+void File::setLPosition(__int64 pos, bool ende) // sets the read position
 {
     if (!pfad) return;
     if (stream)
@@ -149,7 +149,7 @@ void Datei::setLPosition(__int64 pos, bool ende) // sets the read position
     tmpLBPos = 7;
 }
 
-void Datei::setSPosition(__int64 pos, bool ende) // sets the write position
+void File::setSPosition(__int64 pos, bool ende) // sets the write position
 {
     if (!pfad) return;
     if (stream)
@@ -162,7 +162,7 @@ void Datei::setSPosition(__int64 pos, bool ende) // sets the write position
     tmpSBPos = -1;
 }
 
-void Datei::schreibe(const char* bytes, int len) // writes bytes to file
+void File::schreibe(const char* bytes, int len) // writes bytes to file
 {
     if (!pfad || !stream) return;
     if (tmpSBPos >= 0)
@@ -183,13 +183,13 @@ void Datei::schreibe(const char* bytes, int len) // writes bytes to file
         stream->write(bytes, len);
 }
 
-void Framework::Datei::flush()
+void Framework::File::flush()
 {
     if (!pfad || !stream) return;
     stream->flush();
 }
 
-void Datei::lese(char* bytes, int len) // reads bytes from file
+void File::lese(char* bytes, int len) // reads bytes from file
 {
     if (!pfad) return;
     if (stream)
@@ -208,7 +208,7 @@ void Datei::lese(char* bytes, int len) // reads bytes from file
     tmpSBPos = -1;
 }
 
-Text* Datei::leseZeile() // reads a line
+Text* File::leseZeile() // reads a line
 {
     if (!pfad || !stream) return 0;
     if (istEnde()) return 0;
@@ -232,7 +232,7 @@ Text* Datei::leseZeile() // reads a line
     return ret;
 }
 
-void Datei::close() // closes the file
+void File::close() // closes the file
 {
     if (!pfad || !stream) return;
     if (tmpSBPos >= 0)
@@ -254,8 +254,8 @@ void Datei::close() // closes the file
 }
 
 #ifdef WIN32
-bool Datei::setLetzteAEnderung(
-    Zeit* zeit) // sets the modification date of the file
+bool File::setLetzteAEnderung(
+    Time* zeit) // sets the modification date of the file
 {
     if (!pfad)
     {
@@ -283,12 +283,12 @@ bool Datei::setLetzteAEnderung(
     }
     SYSTEMTIME stUTC, stLocal;
     stLocal.wMilliseconds = 0;
-    stLocal.wSecond = zeit->zUhrzeit()->getSekunde();
-    stLocal.wMinute = zeit->zUhrzeit()->getMinute();
-    stLocal.wHour = zeit->zUhrzeit()->getStunde();
-    stLocal.wDay = zeit->zDatum()->getTag();
-    stLocal.wMonth = zeit->zDatum()->getMonat();
-    stLocal.wYear = zeit->zDatum()->getJahr();
+    stLocal.wSecond = zeit->zClock()->getSekunde();
+    stLocal.wMinute = zeit->zClock()->getMinute();
+    stLocal.wHour = zeit->zClock()->getStunde();
+    stLocal.wDay = zeit->zDate()->getTag();
+    stLocal.wMonth = zeit->zDate()->getMonat();
+    stLocal.wYear = zeit->zDate()->getJahr();
     zeit->release();
     if (!TzSpecificLocalTimeToSystemTime(NULL, &stLocal, &stUTC))
     {
@@ -310,7 +310,7 @@ bool Datei::setLetzteAEnderung(
 }
 #endif
 
-bool Datei::getNextBit(bool& bit) // read file bit by bit
+bool File::getNextBit(bool& bit) // read file bit by bit
 {
     if (!pfad || !stream) return 0;
     if (tmpLBPos == 7)
@@ -331,7 +331,7 @@ bool Datei::getNextBit(bool& bit) // read file bit by bit
     return 1;
 }
 
-bool Datei::setNextBit(bool bit) // write file bit by bit
+bool File::setNextBit(bool bit) // write file bit by bit
 {
     if (!pfad || !stream) return 0;
     tmpSBPos++;
@@ -355,7 +355,7 @@ bool Datei::setNextBit(bool bit) // write file bit by bit
 }
 
 // Sets the encryption key for the file
-void Datei::setKey(char* s, int l)
+void File::setKey(char* s, int l)
 {
     if (l == 0)
     {
@@ -369,24 +369,24 @@ void Datei::setKey(char* s, int l)
 }
 
 // constant
-bool Datei::istOrdner() const // checks if the file is a directory
+bool File::istOrdner() const // checks if the file is a directory
 {
     if (!pfad) return 0;
-    return DateiIstVerzeichnis(dynamic_cast<Text*>(pfad->getThis()));
+    return FileIsDirectory(dynamic_cast<Text*>(pfad->getThis()));
 }
 
-bool Datei::istOffen() const // checks if the file is open
+bool File::istOffen() const // checks if the file is open
 {
     if (!pfad) return 0;
     if (stream) return stream->is_open() && stream->good();
     return 0;
 }
 
-int Datei::getUnterdateiAnzahl() const // returns the number of sub-files
+int File::getUnterdateiAnzahl() const // returns the number of sub-files
 {
 #ifdef WIN32
     if (!pfad) return 0;
-    if (!DateiIstVerzeichnis(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileIsDirectory(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     int ret = 0;
     HANDLE fHandle;
     WIN32_FIND_DATA wfd;
@@ -404,7 +404,7 @@ int Datei::getUnterdateiAnzahl() const // returns the number of sub-files
     return ret;
 #else
     if (!pfad) return 0;
-    if (!DateiIstVerzeichnis(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileIsDirectory(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     int ret = 0;
     Text stxt = pfad->getText();
     stxt.ersetzen('\\', '/');
@@ -421,11 +421,11 @@ int Datei::getUnterdateiAnzahl() const // returns the number of sub-files
 #endif
 }
 
-RCArray<Text>* Datei::getDateiListe() const // returns a list of sub-files
+RCArray<Text>* File::getFileList() const // returns a list of sub-files
 {
 #ifdef WIN32
     if (!pfad) return 0;
-    if (!DateiIstVerzeichnis(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileIsDirectory(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     HANDLE fHandle;
     WIN32_FIND_DATA wfd;
     Text stxt = pfad->getText();
@@ -448,7 +448,7 @@ RCArray<Text>* Datei::getDateiListe() const // returns a list of sub-files
     return ret;
 #else
     if (!pfad) return 0;
-    if (!DateiIstVerzeichnis(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileIsDirectory(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     Text stxt = pfad->getText();
     stxt.ersetzen('\\', '/');
     if (stxt.positionVon('/') == stxt.getLength() - 1)
@@ -474,7 +474,7 @@ RCArray<Text>* Datei::getDateiListe() const // returns a list of sub-files
 #endif
 }
 
-__int64 Datei::getSize() const // returns the size of the file
+__int64 File::getSize() const // returns the size of the file
 {
     if (!pfad) return 0;
     if (gr) return gr;
@@ -501,7 +501,7 @@ __int64 Datei::getSize() const // returns the size of the file
     return ret;
 }
 
-Zeit* Datei::getLastChange() const // returns the date of the last modification
+Time* File::getLastChange() const // returns the date of the last modification
 {
     if (!pfad) return 0;
 #ifdef WIN32
@@ -523,8 +523,8 @@ Zeit* Datei::getLastChange() const // returns the date of the last modification
     CloseHandle(hFile);
     if (!FileTimeToSystemTime(&ftWrite, &stUTC)) return 0;
     if (!SystemTimeToTzSpecificLocalTime(NULL, &stUTC, &stLocal)) return 0;
-    Zeit* ret = new Zeit();
-    ret->setZeit(stLocal.wYear,
+    Time* ret = new Time();
+    ret->setTime(stLocal.wYear,
         stLocal.wMonth,
         stLocal.wDay,
         stLocal.wHour,
@@ -535,8 +535,8 @@ Zeit* Datei::getLastChange() const // returns the date of the last modification
     struct stat attrib;
     if (stat(pfad->getText(), &attrib) != 0) return 0;
     tm* clock = gmtime(&(attrib.st_mtime));
-    Zeit* ret = new Zeit();
-    ret->setZeit(clock->tm_year + 1900,
+    Time* ret = new Time();
+    ret->setTime(clock->tm_year + 1900,
         clock->tm_mon + 1,
         clock->tm_mday,
         clock->tm_hour,
@@ -546,37 +546,37 @@ Zeit* Datei::getLastChange() const // returns the date of the last modification
 #endif
 }
 
-bool Datei::existiert() const // checks if the file exists
+bool File::existiert() const // checks if the file exists
 {
     if (!pfad) return 0;
-    return DateiExistiert(dynamic_cast<Text*>(pfad->getThis()));
+    return FileExists(dynamic_cast<Text*>(pfad->getThis()));
 }
 
-__int64 Datei::getLPosition() const // returns the read position
+__int64 File::getLPosition() const // returns the read position
 {
     if (!stream) return 0;
     return stream->tellg();
 }
 
-__int64 Datei::getSPosition() const // returns the write position
+__int64 File::getSPosition() const // returns the write position
 {
     if (!stream) return 0;
     return stream->tellp();
 }
 
-bool Datei::istEnde() const // checks if the end of file is reached
+bool File::istEnde() const // checks if the end of file is reached
 {
     if (!stream || stream->tellg() < 0) return 1;
     __int64 i = getSize();
     return stream->tellg() >= i;
 }
 
-Text* Datei::getPfad() const // returns the file path
+Text* File::getPfad() const // returns the file path
 {
     return pfad ? dynamic_cast<Text*>(pfad->getThis()) : 0;
 }
 
-Text* Datei::zPfad() const
+Text* File::zPfad() const
 {
     return pfad;
 }
@@ -585,7 +585,7 @@ Text* Datei::zPfad() const
 void Framework::GetFreePfad(Text* zPfad) // Searches for an unused filename
 {
     Text txt = zPfad->getText();
-    for (int i = 0; DateiExistiert(txt); i++)
+    for (int i = 0; FileExists(txt); i++)
     {
         txt = zPfad->getText();
         txt.append(i);
@@ -593,45 +593,45 @@ void Framework::GetFreePfad(Text* zPfad) // Searches for an unused filename
     zPfad->setText(txt);
 }
 
-bool Framework::DateiPfadErstellen(Text* pfad) // Creates a file in the path
+bool Framework::FilePathCreate(Text* pfad) // Creates a file in the path
 {
-    bool ret = DateiPfadErstellen(pfad->getText());
+    bool ret = FilePathCreate(pfad->getText());
     pfad->release();
     return ret;
 }
 
-bool Framework::DateiRemove(Text* pfad) // Deletes the specified file
+bool Framework::FileRemove(Text* pfad) // Deletes the specified file
 {
-    bool ret = DateiRemove(pfad->getText());
+    bool ret = FileRemove(pfad->getText());
     pfad->release();
     return ret;
 }
 
-bool Framework::DateiUmbenennen(
+bool Framework::FileRename(
     Text* pfad_alt, Text* pfad_neu) // Renames the file
 {
-    bool ret = DateiUmbenennen(pfad_alt->getText(), pfad_neu->getText());
+    bool ret = FileRename(pfad_alt->getText(), pfad_neu->getText());
     pfad_alt->release();
     pfad_neu->release();
     return ret;
 }
 
-bool Framework::DateiExistiert(Text* pfad) // Checks if the file exists
+bool Framework::FileExists(Text* pfad) // Checks if the file exists
 {
-    bool ret = DateiExistiert(pfad->getText());
+    bool ret = FileExists(pfad->getText());
     pfad->release();
     return ret;
 }
 
-bool Framework::DateiIstVerzeichnis(
+bool Framework::FileIsDirectory(
     Text* pfad) // checks if the path is a directory
 {
-    bool ret = DateiIstVerzeichnis(pfad->getText());
+    bool ret = FileIsDirectory(pfad->getText());
     pfad->release();
     return ret;
 }
 
-bool Framework::DateiPfadErstellen(
+bool Framework::FilePathCreate(
     const char* pfad) // Creates a file in the path
 {
     Text pf = pfad;
@@ -648,7 +648,7 @@ bool Framework::DateiPfadErstellen(
             if (t) t->release();
             continue;
         }
-        if (!DateiExistiert(dynamic_cast<Text*>(t->getThis())))
+        if (!FileExists(dynamic_cast<Text*>(t->getThis())))
 #    pragma warning(suppress : 6031)
             _mkdir(t->getText());
         t->release();
@@ -665,7 +665,7 @@ bool Framework::DateiPfadErstellen(
             if (t) t->release();
             continue;
         }
-        if (!DateiExistiert(dynamic_cast<Text*>(t->getThis())))
+        if (!FileExists(dynamic_cast<Text*>(t->getThis())))
             mkdir(t->getText(), 0777);
         t->release();
         if (pf.positionVon("\\", i) == pf.getLength() - 1) erst = 0;
@@ -676,34 +676,34 @@ bool Framework::DateiPfadErstellen(
         std::ofstream f(pf, std::ios::binary); // Create file
         f.close();
     }
-    return DateiExistiert(pf);
+    return FileExists(pf);
 }
 
-bool Framework::DateiRemove(const char* pfad) // Deletes the specified file
+bool Framework::FileRemove(const char* pfad) // Deletes the specified file
 {
     Text pfa = pfad;
 #ifdef WIN32
     pfa.ersetzen('\\', '/');
     bool ret = 0;
     // check if file exists
-    if (!DateiIstVerzeichnis(dynamic_cast<Text*>(pfa.getThis())))
+    if (!FileIsDirectory(dynamic_cast<Text*>(pfa.getThis())))
         ret = DeleteFile(pfa.getText()) == 1; // delete file
     else
     {
         ret = 1;
-        Datei* dat = new Datei();
-        dat->setDatei(dynamic_cast<Text*>(pfa.getThis()));
+        File* dat = new File();
+        dat->setFile(dynamic_cast<Text*>(pfa.getThis()));
         int anz = dat->getUnterdateiAnzahl();
-        RCArray<Text>* liste = dat->getDateiListe();
+        RCArray<Text>* liste = dat->getFileList();
         for (int i = 0; i < anz; ++i)
         {
             Text* pf = new Text(pfa.getText());
             if (pf->getText()[pf->getLength() - 1] != '/') pf->append("/");
             pf->append(*liste->z(i));
             if (ret)
-                ret = DateiRemove(pf);
+                ret = FileRemove(pf);
             else
-                DateiRemove(pf);
+                FileRemove(pf);
         }
         liste->release();
         dat->release();
@@ -717,24 +717,24 @@ bool Framework::DateiRemove(const char* pfad) // Deletes the specified file
     pfa.ersetzen('\\', '/');
     bool ret = 0;
     // check if file exists
-    if (!DateiIstVerzeichnis(dynamic_cast<Text*>(pfa.getThis())))
+    if (!FileIsDirectory(dynamic_cast<Text*>(pfa.getThis())))
         ret = std::remove(pfa.getText()) == 0; // delete file
     else
     {
         ret = 1;
-        Datei* dat = new Datei();
-        dat->setDatei(dynamic_cast<Text*>(pfa.getThis()));
+        File* dat = new File();
+        dat->setFile(dynamic_cast<Text*>(pfa.getThis()));
         int anz = dat->getUnterdateiAnzahl();
-        RCArray<Text>* liste = dat->getDateiListe();
+        RCArray<Text>* liste = dat->getFileList();
         for (int i = 0; i < anz; ++i)
         {
             Text* pf = new Text(pfa.getText());
             if (pf->getText()[pf->getLength() - 1] != '/') pf->append("/");
             pf->append(liste->get(i));
             if (ret)
-                ret = DateiRemove(pf);
+                ret = FileRemove(pf);
             else
-                DateiRemove(pf);
+                FileRemove(pf);
         }
         liste->release();
         dat->release();
@@ -747,26 +747,26 @@ bool Framework::DateiRemove(const char* pfad) // Deletes the specified file
 #endif
 }
 
-bool Framework::DateiUmbenennen(
+bool Framework::FileRename(
     const char* pfad_alt, const char* pfad_neu) // Renames the file
 {
 #ifdef WIN32
-    if (pfad_alt && pfad_neu && DateiExistiert(pfad_alt))
+    if (pfad_alt && pfad_neu && FileExists(pfad_alt))
     {
         bool ret = 1;
-        if (DateiIstVerzeichnis(pfad_alt))
+        if (FileIsDirectory(pfad_alt))
         {
-            if (!DateiExistiert(pfad_neu))
+            if (!FileExists(pfad_neu))
             {
                 Text tmp = pfad_neu;
                 tmp += "/a";
-                DateiPfadErstellen(tmp);
-                DateiRemove(tmp);
+                FilePathCreate(tmp);
+                FileRemove(tmp);
             }
-            Datei d;
-            d.setDatei(pfad_alt);
-            RCArray<Text>* list = d.getDateiListe();
-            int anz = list->getEintragAnzahl();
+            File d;
+            d.setFile(pfad_alt);
+            RCArray<Text>* list = d.getFileList();
+            int anz = list->getEntryCount();
             for (int i = 0; i < anz; i++)
             {
                 Text pf = pfad_neu;
@@ -775,35 +775,35 @@ bool Framework::DateiUmbenennen(
                 Text pf_a = pfad_alt;
                 pf_a += "/";
                 pf_a += list->z(i)->getText();
-                ret |= DateiUmbenennen(pf_a, pf);
+                ret |= FileRename(pf_a, pf);
             }
             d.remove();
         }
         else
         {
-            if (DateiExistiert(pfad_neu)) return 0;
+            if (FileExists(pfad_neu)) return 0;
         }
         ret |= MoveFile(pfad_alt, pfad_neu) == 1; // rename file
         return ret;
     }
     return 0;
 #else
-    if (pfad_alt && pfad_neu && DateiExistiert(pfad_alt))
+    if (pfad_alt && pfad_neu && FileExists(pfad_alt))
     {
         bool ret = 1;
-        if (DateiIstVerzeichnis(pfad_alt))
+        if (FileIsDirectory(pfad_alt))
         {
-            if (!DateiExistiert(pfad_neu))
+            if (!FileExists(pfad_neu))
             {
                 Text tmp = pfad_neu;
                 tmp += "/a";
-                DateiPfadErstellen(tmp);
-                DateiRemove(tmp);
+                FilePathCreate(tmp);
+                FileRemove(tmp);
             }
-            Datei d;
-            d.setDatei(pfad_alt);
-            RCArray<Text>* list = d.getDateiListe();
-            int anz = list->getEintragAnzahl();
+            File d;
+            d.setFile(pfad_alt);
+            RCArray<Text>* list = d.getFileList();
+            int anz = list->getEntryCount();
             for (int i = 0; i < anz; i++)
             {
                 Text pf = pfad_neu;
@@ -812,13 +812,13 @@ bool Framework::DateiUmbenennen(
                 Text pf_a = pfad_alt;
                 pf_a += "/";
                 pf_a += list->z(i)->getText();
-                ret |= DateiUmbenennen(pf_a, pf);
+                ret |= FileRename(pf_a, pf);
             }
             d.remove();
         }
         else
         {
-            if (DateiExistiert(pfad_neu)) return 0;
+            if (FileExists(pfad_neu)) return 0;
         }
         ret |= rename(pfad_alt, pfad_neu) == 1; // rename file
         return ret;
@@ -827,7 +827,7 @@ bool Framework::DateiUmbenennen(
 #endif
 }
 
-bool Framework::DateiExistiert(const char* pfad) // Checks if the file exists
+bool Framework::FileExists(const char* pfad) // Checks if the file exists
 {
 #ifdef WIN32
     bool ret = PathFileExists(pfad) != 0;
@@ -839,7 +839,7 @@ bool Framework::DateiExistiert(const char* pfad) // Checks if the file exists
 #endif
 }
 
-bool Framework::DateiIstVerzeichnis(
+bool Framework::FileIsDirectory(
     const char* pfad) // checks if the path is a directory
 {
 #ifdef WIN32

File.h

@@ -1,5 +1,5 @@
-#ifndef Datei_H
-#define Datei_H
+#ifndef File_H
+#define File_H
 
 #include <fstream>
 
@@ -10,16 +10,16 @@
 namespace Framework
 {
     class Text; //! Text.h
-    class Zeit; //! Time.h
+    class Time; //! Time.h
 
     namespace Encryption
     {
         class Key; //! Key.h
     }
-    class Datei; //! from this file
+    class File; //! from this file
 
     //! Reads and writes to a file
-    class Datei : public Reader,
+    class File : public Reader,
                   public Writer,
                   public virtual ReferenceCounter
     {
@@ -46,19 +46,19 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT Datei();
+        DLLEXPORT File();
         //! Constructor
-        DLLEXPORT Datei(const char* pfad);
+        DLLEXPORT File(const char* pfad);
         //! Constructor
-        DLLEXPORT Datei(Text* pfad);
+        DLLEXPORT File(Text* pfad);
         //! Destructor
-        DLLEXPORT virtual ~Datei();
+        DLLEXPORT virtual ~File();
         //! Sets the path to the file
         //! \param pfad The path
-        DLLEXPORT void setDatei(const char* pfad);
+        DLLEXPORT void setFile(const char* pfad);
         //! Sets the path to the file
         //! \param pfad The path
-        DLLEXPORT void setDatei(Text* pfad);
+        DLLEXPORT void setFile(Text* pfad);
         //! Renames or moves the file
         //! \param pfad The new path to the file. If only the name changes,
         //! it is only renamed
@@ -78,7 +78,7 @@ namespace Framework
         DLLEXPORT bool erstellen();
         //! Opens the file
         //! \param style Specifies whether the file is opened for reading and/or
-        //! writing. All elements from Datei::Style:: are possible
+        //! writing. All elements from File::Style:: are possible
         //!  return 1 if the file was opened successfully. 0 otherwise
         DLLEXPORT bool open(int style);
         //! Sets the position of the byte to be read next
@@ -112,7 +112,7 @@ namespace Framework
         //! Sets the timestamp of the last modification of the file (Windows only)
         //! \param zeit The timestamp of the last modification
         //! \return 1 if the timestamp was set. 0 otherwise
-        DLLEXPORT bool setLetzteAEnderung(Zeit* zeit);
+        DLLEXPORT bool setLetzteAEnderung(Time* zeit);
 #endif
         //! Reads the next bit from the file
         //! \param bit A reference to a bool where the bit will be stored
@@ -135,7 +135,7 @@ namespace Framework
         //! Returns a list of sub-files
         //!  return 0 if the file is not a directory. A list with the
         //!  names of the sub-files
-        DLLEXPORT RCArray<Text>* getDateiListe() const;
+        DLLEXPORT RCArray<Text>* getFileList() const;
         //! Returns the size of the file
         //! return -1 if the file is a directory or an error occurred.
         //! Otherwise the size of the file
@@ -143,7 +143,7 @@ namespace Framework
         //! Returns the timestamp of the last modification
         //! \return 0 if an error occurred. The timestamp of the
         //! last modification otherwise
-        DLLEXPORT Zeit* getLastChange() const;
+        DLLEXPORT Time* getLastChange() const;
         //! Checks whether the file exists
         //! \return 1 if the file exists. 0 otherwise
         DLLEXPORT bool existiert() const;
@@ -174,47 +174,47 @@ namespace Framework
     //! Creates the complete path including file
     //! \param pfad The path to the file
     //! \return 1 if the creation was successful.
-    DLLEXPORT bool DateiPfadErstellen(Text* pfad);
+    DLLEXPORT bool FilePathCreate(Text* pfad);
     //! Deletes the specified file
     //! \param pfad The path to the file
     //! \return 1 if the file was deleted
-    DLLEXPORT bool DateiRemove(Text* pfad);
+    DLLEXPORT bool FileRemove(Text* pfad);
     //! Renames or moves a file
     //!  pfad_alt: The path to the file to be renamed.
     //!  pfad_neu: The new path to the file. If only the name changes,
     //!  it is only renamed
     //! \return 1 if the renaming was successful. 0 otherwise
-    DLLEXPORT bool DateiUmbenennen(Text* pfad_alt, Text* pfad_neu);
+    DLLEXPORT bool FileRename(Text* pfad_alt, Text* pfad_neu);
     //! Checks whether a file exists
     //! \param pfad The path to the file
     //! \return 1 if the file exists. 0 if the file was not found
-    DLLEXPORT bool DateiExistiert(Text* pfad);
+    DLLEXPORT bool FileExists(Text* pfad);
     //! Checks whether a path is a directory
     //! \param pfad The path to the file
     //! \return 1 if the file is a directory. 0 otherwise
-    DLLEXPORT bool DateiIstVerzeichnis(Text* pfad);
+    DLLEXPORT bool FileIsDirectory(Text* pfad);
     //! Creates the complete path including file
     //! \param pfad The path to the file
     //! \return 1 if the creation was successful.
-    DLLEXPORT bool DateiPfadErstellen(const char* pfad);
+    DLLEXPORT bool FilePathCreate(const char* pfad);
     //! Deletes the specified file
     //! \param pfad The path to the file
     //! \return 1 if the file was deleted
-    DLLEXPORT bool DateiRemove(const char* pfad);
+    DLLEXPORT bool FileRemove(const char* pfad);
     //! Renames or moves a file
     //!  pfad_alt: The path to the file to be renamed.
     //!  pfad_neu: The new path to the file. If only the name changes,
     //!  it is only renamed
     //! \return 1 if the renaming was successful. 0 otherwise
-    DLLEXPORT bool DateiUmbenennen(const char* pfad_alt, const char* pfad_neu);
+    DLLEXPORT bool FileRename(const char* pfad_alt, const char* pfad_neu);
     //! Checks whether a file exists
     //! \param pfad The path to the file
     //! \return 1 if the file exists. 0 if the file was not found
-    DLLEXPORT bool DateiExistiert(const char* pfad);
+    DLLEXPORT bool FileExists(const char* pfad);
     //! Checks whether a path is a directory
     //! \param pfad The path to the file
     //! \return 1 if the file is a directory. 0 otherwise
-    DLLEXPORT bool DateiIstVerzeichnis(const char* pfad);
+    DLLEXPORT bool FileIsDirectory(const char* pfad);
 } // namespace Framework
 
 #endif

FileDialog.cpp

@@ -14,9 +14,9 @@ void Framework::InitDialog()
 
 using namespace Framework;
 
-// Contents of the DateiDialog class from FileDialog.h
+// Contents of the FileDialog class from FileDialog.h
 // Constructor
-DateiDialog::DateiDialog()
+FileDialog::FileDialog()
     : ReferenceCounter()
 {
     typeName = new RCArray<Text>();
@@ -25,37 +25,37 @@ DateiDialog::DateiDialog()
 }
 
 // Destructor
-DateiDialog::~DateiDialog()
+FileDialog::~FileDialog()
 {
     typeName->release();
     type->release();
 }
 
 // non-constant
-void DateiDialog::removeDateiTypen()
+void FileDialog::removeFileTypes()
 {
     typeName->leeren();
     type->leeren();
 }
 
-void DateiDialog::addDateiTyp(const char* name, const char* typ)
+void FileDialog::addFileType(const char* name, const char* typ)
 {
-    addDateiTyp(new Text(name), new Text(typ));
+    addFileType(new Text(name), new Text(typ));
 }
 
-void DateiDialog::addDateiTyp(Text* name, Text* typ)
+void FileDialog::addFileType(Text* name, Text* typ)
 {
     typeName->add(name);
     type->add(typ);
 }
 
-void DateiDialog::setDateiTypAuswahl(int i)
+void FileDialog::setFileTypeSelection(int i)
 {
     fileIndex = i + 1;
 }
 
 // constant
-Text* DateiDialog::anzeigen(bool open) const
+Text* FileDialog::anzeigen(bool open) const
 {
     IFileDialog* pfd = NULL;
     CoInitialize(NULL);
@@ -83,12 +83,12 @@ Text* DateiDialog::anzeigen(bool open) const
             hr = pfd->SetOptions(dwFlags | FOS_FORCEFILESYSTEM);
             if (SUCCEEDED(hr))
             {
-                int anz = type->getEintragAnzahl();
+                int anz = type->getEntryCount();
                 COMDLG_FILTERSPEC* c_rgSaveTypes = 0;
                 if (!anz)
                 {
                     c_rgSaveTypes = new COMDLG_FILTERSPEC[1];
-                    c_rgSaveTypes[0] = {L"Alle Dateien", L"*.*"};
+                    c_rgSaveTypes[0] = {L"Alle Files", L"*.*"};
                     anz = 1;
                 }
                 else
@@ -188,18 +188,18 @@ Text* DateiDialog::anzeigen(bool open) const
     return 0;
 }
 
-// Contents of the DateiDialogTh class from FileDialog.h
+// Contents of the FileDialogTh class from FileDialog.h
 // Constructor
-DateiDialogTh::DateiDialogTh()
+FileDialogTh::FileDialogTh()
     : Thread()
 {
-    dialog = new DateiDialog();
+    dialog = new FileDialog();
     ret = 0;
     open = 0;
 }
 
 // Destructor
-DateiDialogTh::~DateiDialogTh()
+FileDialogTh::~FileDialogTh()
 {
     warteAufThread(5000);
     if (run) ende();
@@ -208,44 +208,44 @@ DateiDialogTh::~DateiDialogTh()
 }
 
 // non-constant
-void DateiDialogTh::setOpen(bool b)
+void FileDialogTh::setOpen(bool b)
 {
     open = b;
 }
 
-void DateiDialogTh::removeDateiTypen()
+void FileDialogTh::removeFileTypes()
 {
-    dialog->removeDateiTypen();
+    dialog->removeFileTypes();
 }
 
-void DateiDialogTh::addDateiTyp(const char* name, const char* typ)
+void FileDialogTh::addFileType(const char* name, const char* typ)
 {
-    dialog->addDateiTyp(name, typ);
+    dialog->addFileType(name, typ);
 }
 
-void DateiDialogTh::addDateiTyp(Text* name, Text* typ)
+void FileDialogTh::addFileType(Text* name, Text* typ)
 {
-    dialog->addDateiTyp(name, typ);
+    dialog->addFileType(name, typ);
 }
 
-void DateiDialogTh::setDateiTypAuswahl(int i)
+void FileDialogTh::setFileTypeSelection(int i)
 {
-    dialog->setDateiTypAuswahl(i);
+    dialog->setFileTypeSelection(i);
 }
 
-void DateiDialogTh::thread()
+void FileDialogTh::thread()
 {
     if (ret) ret = (Text*)ret->release();
     ret = dialog->anzeigen(open);
 }
 
 // constant
-Text* DateiDialogTh::getPfad() const
+Text* FileDialogTh::getPfad() const
 {
     return ret ? dynamic_cast<Text*>(ret->getThis()) : 0;
 }
 
-Text* DateiDialogTh::zPfad() const
+Text* FileDialogTh::zPfad() const
 {
     return ret;
 }

FileDialog.h

@@ -1,5 +1,5 @@
-#ifndef DateiDialog_H
-#define DateiDialog_H
+#ifndef FileDialog_H
+#define FileDialog_H
 
 #include "Array.h"
 #include "Thread.h"
@@ -11,7 +11,7 @@ namespace Framework
     void InitDialog();
 
     //! Creates a file open/save dialog
-    class DateiDialog : public virtual ReferenceCounter
+    class FileDialog : public virtual ReferenceCounter
     {
     private:
         RCArray<Text>* typeName;
@@ -20,23 +20,23 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT DateiDialog();
+        DLLEXPORT FileDialog();
         //! Destructor
-        DLLEXPORT ~DateiDialog();
+        DLLEXPORT ~FileDialog();
         //! Clears the list of allowed file types
-        DLLEXPORT void removeDateiTypen();
+        DLLEXPORT void removeFileTypes();
         //! Adds an allowed file type
         //! \param name The name of the file type. Visible to the user in the
         //! select box \param typ The file type that may be selected
-        DLLEXPORT void addDateiTyp(const char* name, const char* typ);
+        DLLEXPORT void addFileType(const char* name, const char* typ);
         //! Adds an allowed file type
         //! \param name The name of the file type. Visible to the user in the
         //! select box \param typ The file type that may be selected
-        DLLEXPORT void addDateiTyp(Text* name, Text* typ);
+        DLLEXPORT void addFileType(Text* name, Text* typ);
         //! Sets the initially selected file type
         //! \param i The index of the file type. The one added first
         //! has index 0.
-        DLLEXPORT void setDateiTypAuswahl(int i);
+        DLLEXPORT void setFileTypeSelection(int i);
         //! Shows the file dialog
         //! \param open true if the dialog should be used for opening. false for
         //! saving \return The path to the selected file
@@ -44,35 +44,35 @@ namespace Framework
     };
 
     //! Manages a file open/save dialog without blocking
-    class DateiDialogTh : public Thread
+    class FileDialogTh : public Thread
     {
     private:
-        DateiDialog* dialog;
+        FileDialog* dialog;
         Text* ret;
         bool open;
 
     public:
         //! Constructor
-        DLLEXPORT DateiDialogTh();
+        DLLEXPORT FileDialogTh();
         //! Destructor
-        DLLEXPORT ~DateiDialogTh();
+        DLLEXPORT ~FileDialogTh();
         //! Sets whether the dialog is for opening or saving
         //! \param b 1 if for opening. 0 if for saving
         DLLEXPORT void setOpen(bool b);
         //! Clears the list of allowed file types
-        DLLEXPORT void removeDateiTypen();
+        DLLEXPORT void removeFileTypes();
         //! Adds an allowed file type
         //! \param name The name of the file type. Visible to the user in the
         //! select box \param typ The file type that may be selected
-        DLLEXPORT void addDateiTyp(const char* name, const char* typ);
+        DLLEXPORT void addFileType(const char* name, const char* typ);
         //! Adds an allowed file type
         //! \param name The name of the file type. Visible to the user in the
         //! select box \param typ The file type that may be selected
-        DLLEXPORT void addDateiTyp(Text* name, Text* typ);
+        DLLEXPORT void addFileType(Text* name, Text* typ);
         //! Sets the initially selected file type
         //! \param i The index of the file type. The one added first
         //! has index 0.
-        DLLEXPORT void setDateiTypAuswahl(int i);
+        DLLEXPORT void setFileTypeSelection(int i);
         //! This function is called by the class itself.
         //! Use the start function to show the dialog
         DLLEXPORT void thread() override;

FileSystem.cpp

@@ -507,9 +507,9 @@ unsigned char LTDBPixel::getA() const // returns alpha
     return A;
 }
 
-// Content of the LTDBDateiKopf class from FileSystem.h
+// Content of the LTDBFileHeader class from FileSystem.h
 // Constructor
-LTDBDateiKopf::LTDBDateiKopf()
+LTDBFileHeader::LTDBFileHeader()
     : ReferenceCounter(),
       bilder(new RCArray<Text>()),
       pos(new Array<__int64>()),
@@ -517,14 +517,14 @@ LTDBDateiKopf::LTDBDateiKopf()
 {}
 
 // Destructor
-LTDBDateiKopf::~LTDBDateiKopf()
+LTDBFileHeader::~LTDBFileHeader()
 {
     bilder->release();
     pos->release();
 }
 
 // non-constant
-void LTDBDateiKopf::removeImage(int i)
+void LTDBFileHeader::removeImage(int i)
 {
     if (i >= bAnzahl) return;
     bilder->remove(i);
@@ -532,7 +532,7 @@ void LTDBDateiKopf::removeImage(int i)
     --bAnzahl;
 }
 
-void LTDBDateiKopf::removeImage(Text* txt)
+void LTDBFileHeader::removeImage(Text* txt)
 {
     int i = -1;
     for (int ii = 0; ii < bAnzahl; ++ii)
@@ -551,19 +551,19 @@ void LTDBDateiKopf::removeImage(Text* txt)
     --bAnzahl;
 }
 
-void LTDBDateiKopf::addImage(Text* txt)
+void LTDBFileHeader::addImage(Text* txt)
 {
     bilder->add(txt, bAnzahl);
     pos->add(0, bAnzahl);
     ++bAnzahl;
 }
 
-void LTDBDateiKopf::setImagePos(int i, __int64 pos)
+void LTDBFileHeader::setImagePos(int i, __int64 pos)
 {
     this->pos->set(pos, i);
 }
 
-void LTDBDateiKopf::setImagePos(Text* txt, __int64 pos)
+void LTDBFileHeader::setImagePos(Text* txt, __int64 pos)
 {
     int i = -1;
     for (int ii = 0; ii < bAnzahl; ++ii)
@@ -580,7 +580,7 @@ void LTDBDateiKopf::setImagePos(Text* txt, __int64 pos)
     this->pos->set(pos, i);
 }
 
-void LTDBDateiKopf::laden(FBalken* f, std::ifstream* inF)
+void LTDBFileHeader::laden(ProgressBar* f, std::ifstream* inF)
 {
     if (inF->is_open() && inF->good())
     {
@@ -600,7 +600,7 @@ void LTDBDateiKopf::laden(FBalken* f, std::ifstream* inF)
         pos->leeren();
         for (int i = 0; i < bAnzahl; ++i)
         {
-            LTDBKopf* kpf = new LTDBKopf();
+            LTDBHeader* kpf = new LTDBHeader();
             kpf->laden(inF);              // image name and half file position
             bilder->add(kpf->getTitel()); // sets title
             Punkt gr = kpf->getSize();
@@ -623,7 +623,7 @@ void LTDBDateiKopf::laden(FBalken* f, std::ifstream* inF)
 }
 
 // constant
-void LTDBDateiKopf::speichern(std::ofstream* outF) const
+void LTDBFileHeader::speichern(std::ofstream* outF) const
 {
     if (outF->is_open() && outF->good())
     {
@@ -633,7 +633,7 @@ void LTDBDateiKopf::speichern(std::ofstream* outF) const
         outF->write(&b, 1);
         for (int i = 0; i < bAnzahl; ++i)
         {
-            LTDBKopf* kpf = new LTDBKopf();
+            LTDBHeader* kpf = new LTDBHeader();
             __int64 position = pos->get(i);
             kpf->Init(bilder->get(i),
                 Punkt((int)(position >> 52), (int)(position >> 40)));
@@ -649,17 +649,17 @@ void LTDBDateiKopf::speichern(std::ofstream* outF) const
     }
 }
 
-Text* LTDBDateiKopf::getImage(int i) const
+Text* LTDBFileHeader::getImage(int i) const
 {
     return bilder->get(i);
 }
 
-Text* LTDBDateiKopf::zImage(int i) const
+Text* LTDBFileHeader::zImage(int i) const
 {
     return bilder->z(i);
 }
 
-__int64 LTDBDateiKopf::getImagePosition(Text* txt) const
+__int64 LTDBFileHeader::getImagePosition(Text* txt) const
 {
     int i = -1;
     for (int ii = 0; ii < bAnzahl; ++ii)
@@ -676,12 +676,12 @@ __int64 LTDBDateiKopf::getImagePosition(Text* txt) const
     return pos->get(i);
 }
 
-__int64 LTDBDateiKopf::getImagePosition(int index) const
+__int64 LTDBFileHeader::getImagePosition(int index) const
 {
     return pos->get(index);
 }
 
-int LTDBDateiKopf::getImageIndex(Text* txt) const
+int LTDBFileHeader::getImageIndex(Text* txt) const
 {
     int i = -1;
     for (int ii = 0; ii < bAnzahl; ++ii)
@@ -697,24 +697,24 @@ int LTDBDateiKopf::getImageIndex(Text* txt) const
     return i;
 }
 
-int LTDBDateiKopf::getbAnzahl() const
+int LTDBFileHeader::getbAnzahl() const
 {
     return bAnzahl;
 }
 
-RCArray<Text>* LTDBDateiKopf::zImageListe() const
+RCArray<Text>* LTDBFileHeader::zImageListe() const
 {
     return bilder;
 }
 
-// Content of the LTDBKopf class from FileSystem.h
+// Content of the LTDBHeader class from FileSystem.h
 // Constructor
-LTDBKopf::LTDBKopf()
+LTDBHeader::LTDBHeader()
     : ReferenceCounter()
 {}
 
 // non-constant
-void LTDBKopf::laden(std::ifstream* f) // Loads data from a file
+void LTDBHeader::laden(std::ifstream* f) // Loads data from a file
 {
     if (f->is_open())
     {
@@ -737,7 +737,7 @@ void LTDBKopf::laden(std::ifstream* f) // Loads data from a file
     }
 }
 
-int LTDBKopf::Init(Text* t, const Punkt& g) // Fills the data
+int LTDBHeader::Init(Text* t, const Punkt& g) // Fills the data
 {
     a = 0;
     b = 0;
@@ -838,7 +838,7 @@ int LTDBKopf::Init(Text* t, const Punkt& g) // Fills the data
     return skipped;
 }
 
-void LTDBKopf::setBits(int BeginBit, int EndBit, __int16 bits)
+void LTDBHeader::setBits(int BeginBit, int EndBit, __int16 bits)
 {
     if (EndBit - BeginBit > 16) EndBit = BeginBit + 16;
     if (BeginBit < 64)
@@ -881,7 +881,7 @@ void LTDBKopf::setBits(int BeginBit, int EndBit, __int16 bits)
 }
 
 // constant
-void LTDBKopf::speichern(
+void LTDBHeader::speichern(
     std::ofstream* f) const // Saves data to a file
 {
     if (f->is_open())
@@ -899,13 +899,13 @@ void LTDBKopf::speichern(
     }
 }
 
-int LTDBKopf::getTitelLength() const // returns the length of the image name
+int LTDBHeader::getTitelLength() const // returns the length of the image name
 {
     return (int)(a >> 60 & Bits(4)); // The title length is stored in the first
                                      // 4 bits of the file
 }
 
-Text* LTDBKopf::getTitel() const // returns the name of the image
+Text* LTDBHeader::getTitel() const // returns the name of the image
 {
     Text* ret = new Text("");
     char c[2];
@@ -979,7 +979,7 @@ Text* LTDBKopf::getTitel() const // returns the name of the image
     return ret;
 }
 
-Punkt LTDBKopf::getSize() const // returns the size of the image
+Punkt LTDBHeader::getSize() const // returns the size of the image
 {
     int BeginBit = 4 /*title length*/ + getTitelLength() * 5 /*title*/;
     int EndBit = BeginBit + 24;
@@ -988,7 +988,7 @@ Punkt LTDBKopf::getSize() const // returns the size of the image
     return Punkt((int)(grx & Bits(12)), (int)(gry & Bits(12)));
 }
 
-__int16 LTDBKopf::getBits(int begin,
+__int16 LTDBHeader::getBits(int begin,
 int ende) const // returns the bits from begin to ende (excluding ende)
 {
     if (ende < begin) return 0;
@@ -1041,7 +1041,7 @@ LTDBBody::LTDBBody()
       b(new Image())
 {}
 
-LTDBBody::LTDBBody(LTDBKopf* k) // calls init
+LTDBBody::LTDBBody(LTDBHeader* k) // calls init
     : ReferenceCounter(),
       gr(0, 0),
       b(new Image())
@@ -1056,7 +1056,7 @@ LTDBBody::~LTDBBody()
 }
 
 // non-constant
-void LTDBBody::init(LTDBKopf k) // Initializes, required before loading
+void LTDBBody::init(LTDBHeader k) // Initializes, required before loading
 {
     gr = k.getSize();
     int l = k.getTitelLength();
@@ -1064,7 +1064,7 @@ void LTDBBody::init(LTDBKopf k) // Initializes, required before loading
     dateiSize = (l / 8.0 == l) ? (l / 8) : (l / 8 + 1);
 }
 
-void LTDBBody::init(LTDBKopf* k) // Initializes, required before loading
+void LTDBBody::init(LTDBHeader* k) // Initializes, required before loading
 {
     gr = k->getSize();
     int l = k->getTitelLength();
@@ -1073,7 +1073,7 @@ void LTDBBody::init(LTDBKopf* k) // Initializes, required before loading
     k->release();
 }
 
-void LTDBBody::laden(FBalken* zF, std::ifstream* inF) // loads the image
+void LTDBBody::laden(ProgressBar* zF, std::ifstream* inF) // loads the image
 {
     b->neuImage(gr.x, gr.y, 0xFF000000); // create new image
     int* buff = b->getBuffer();
@@ -1123,7 +1123,7 @@ void LTDBBody::setImage(Image* b) // sets the image to be saved
 
 // constant
 void LTDBBody::speichern(
-    FBalken* zF, std::ofstream* outF) const // saves image
+    ProgressBar* zF, std::ofstream* outF) const // saves image
 {
     if (outF->is_open())
     {
@@ -1191,48 +1191,48 @@ const Punkt& LTDBBody::getSize() const // returns the size of the image
     return gr;
 }
 
-// Content of the LTDBDatei class from FileSystem.h
+// Content of the LTDBFile class from FileSystem.h
 // Constructor
-LTDBDatei::LTDBDatei()
+LTDBFile::LTDBFile()
     : ReferenceCounter(),
       pfad(new Text()),
       datKpf(0)
 {}
 
 // Destructor
-LTDBDatei::~LTDBDatei()
+LTDBFile::~LTDBFile()
 {
     if (pfad) pfad->release();
     if (datKpf) datKpf->release();
 }
 
 // non-constant
-void LTDBDatei::setDatei(Text* pfad) // Sets the path to the file
+void LTDBFile::setFile(Text* pfad) // Sets the path to the file
 { // Delete values of any previous file
-    if (datKpf) datKpf = (LTDBDateiKopf*)datKpf->release();
+    if (datKpf) datKpf = (LTDBFileHeader*)datKpf->release();
     // Set path
     this->pfad->setText(*pfad);
     pfad->release();
 }
 
-void LTDBDatei::erstellen() // Creates the file
+void LTDBFile::erstellen() // Creates the file
 {
-    DateiPfadErstellen(dynamic_cast<Text*>(pfad->getThis()));
+    FilePathCreate(dynamic_cast<Text*>(pfad->getThis()));
     std::ofstream* outF = new std::ofstream(pfad->getText(), std::ios::binary);
     int i = 0;
     outF->write((char*)&i, 2);
     delete outF;
 }
 
-void LTDBDatei::leseDaten(
-    FBalken* f) // The class briefly reads all images and remembers
+void LTDBFile::leseDaten(
+    ProgressBar* f) // The class briefly reads all images and remembers
                 // where in the file each one is located
 { // This function will take some time, but will make
   // the other functions faster afterwards
-    if (DateiExistiert(dynamic_cast<Text*>(pfad->getThis())))
+    if (FileExists(dynamic_cast<Text*>(pfad->getThis())))
     {
         if (datKpf) datKpf->release();
-        datKpf = new LTDBDateiKopf();
+        datKpf = new LTDBFileHeader();
         std::ifstream* inF
             = new std::ifstream(pfad->getText(), std::ios::binary);
         datKpf->laden(f, inF);
@@ -1240,18 +1240,18 @@ void LTDBDatei::leseDaten(
     }
 }
 
-void LTDBDatei::remove() // Deletes the file
+void LTDBFile::remove() // Deletes the file
 {
-    if (DateiExistiert(dynamic_cast<Text*>(pfad->getThis())))
+    if (FileExists(dynamic_cast<Text*>(pfad->getThis())))
     {
-        DateiRemove(dynamic_cast<Text*>(pfad->getThis()));
+        FileRemove(dynamic_cast<Text*>(pfad->getThis()));
         if (datKpf) datKpf->release();
     }
 }
 
-void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
+void LTDBFile::remove(ProgressBar* f, Text* name) // Deletes an image from the file
 {
-    if (DateiExistiert(dynamic_cast<Text*>(pfad->getThis())) && name)
+    if (FileExists(dynamic_cast<Text*>(pfad->getThis())) && name)
     {
         if (!datKpf) leseDaten(0); // read data
         // Check if file is not present
@@ -1270,7 +1270,7 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
         Text* pf_tmp = new Text(pfad->getText());
         char c = '0';
         pf_tmp->append("0");
-        for (int i = 0; DateiExistiert(dynamic_cast<Text*>(pf_tmp->getThis()));
+        for (int i = 0; FileExists(dynamic_cast<Text*>(pf_tmp->getThis()));
             ++i)
         {
             c = (char)('0' + (i % 10));
@@ -1292,7 +1292,7 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
             __int64 position = datKpf->getImagePosition(index);
             datKpf->removeImage(index);
             datKpf->speichern(outF);
-            LTDBDateiKopf* kpf_tmp = new LTDBDateiKopf();
+            LTDBFileHeader* kpf_tmp = new LTDBFileHeader();
             kpf_tmp->laden(0, inF);
             kpf_tmp->release();
             char byte = 0;
@@ -1305,12 +1305,12 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
                 inF->read(&byte, 1);
                 outF->write(&byte, 1);
             } // skip image to be deleted
-            LTDBKopf* delkpf = new LTDBKopf();
+            LTDBHeader* delkpf = new LTDBHeader();
             delkpf->laden(inF);
             LTDBBody* delkpr
-                = new LTDBBody(dynamic_cast<LTDBKopf*>(delkpf->getThis()));
+                = new LTDBBody(dynamic_cast<LTDBHeader*>(delkpf->getThis()));
             delkpr->laden(f, inF);
-            delkpf = (LTDBKopf*)delkpf->release();
+            delkpf = (LTDBHeader*)delkpf->release();
             delkpr = (LTDBBody*)delkpr->release(); // copy remaining bytes
             pos_minus = inF->tellg() - outF->tellp();
             for (__int64 i = (__int64)inF->tellg(); i < datlen; ++i)
@@ -1324,8 +1324,8 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
             datKpf->speichern(outF);
             inF->close();
             outF->close();
-            DateiRemove(dynamic_cast<Text*>(pfad->getThis()));
-            DateiUmbenennen(dynamic_cast<Text*>(pf_tmp->getThis()),
+            FileRemove(dynamic_cast<Text*>(pfad->getThis()));
+            FileRename(dynamic_cast<Text*>(pf_tmp->getThis()),
                 dynamic_cast<Text*>(pfad->getThis()));
         }
         delete inF;
@@ -1335,17 +1335,17 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
     if (name) name = (Text*)name->release();
 }
 
-Image* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
+Image* LTDBFile::laden(ProgressBar* f, Text* name) // Loads an image from the file
 {
     if (name)
     {
-        if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis())))
+        if (!FileExists(dynamic_cast<Text*>(pfad->getThis())))
         {
             name->release();
             return 0;
         }
         if (!datKpf) leseDaten(0);
-        LTDBKopf* k_tmp = new LTDBKopf();
+        LTDBHeader* k_tmp = new LTDBHeader();
         k_tmp->Init(dynamic_cast<Text*>(name->getThis()), Punkt(0, 0));
         int index = datKpf->getImageIndex(k_tmp->getTitel());
         k_tmp->release();
@@ -1365,7 +1365,7 @@ Image* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
         // Determine start of the file to load
         __int64 position = datKpf->getImagePosition(index);
         inF->seekg(position, std::ios::beg);
-        LTDBKopf* kpf = new LTDBKopf();
+        LTDBHeader* kpf = new LTDBHeader();
         kpf->laden(inF);
         Text* t = kpf->getTitel();
         if (!t->istGleich(*name))
@@ -1384,7 +1384,7 @@ Image* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
             return 0;
         }
         t->release();
-        LTDBBody* kpr = new LTDBBody(dynamic_cast<LTDBKopf*>(kpf->getThis()));
+        LTDBBody* kpr = new LTDBBody(dynamic_cast<LTDBHeader*>(kpf->getThis()));
         kpr->laden(f, inF); // load image
         Image* ret = kpr->getImage();
         kpr->release();
@@ -1397,13 +1397,13 @@ Image* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
     return 0;
 }
 
-int LTDBDatei::speichern(
-FBalken* f, Image* bild, Text* name) // Saves an image to the file
+int LTDBFile::speichern(
+ProgressBar* f, Image* bild, Text* name) // Saves an image to the file
 {
     int warn = -1;
     if (name && bild)
     {
-        if (DateiExistiert(dynamic_cast<Text*>(pfad->getThis())))
+        if (FileExists(dynamic_cast<Text*>(pfad->getThis())))
         {
             if (!datKpf) leseDaten(0);
             int index
@@ -1411,7 +1411,7 @@ FBalken* f, Image* bild, Text* name) // Saves an image to the file
             if (index == -1)
             {
                 warn = 0;
-                LTDBKopf* kpf = new LTDBKopf();
+                LTDBHeader* kpf = new LTDBHeader();
                 warn = kpf->Init(
                     dynamic_cast<Text*>(name->getThis()), bild->getSize());
                 if (datKpf->getImageIndex(kpf->getTitel()) != -1)
@@ -1428,7 +1428,7 @@ FBalken* f, Image* bild, Text* name) // Saves an image to the file
                 char c = '0';
                 pf_tmp->append("0");
                 for (int i = 0;
-                    DateiExistiert(dynamic_cast<Text*>(pf_tmp->getThis()));
+                    FileExists(dynamic_cast<Text*>(pf_tmp->getThis()));
                     ++i)
                 {
                     c = (char)('0' + (i % 10));
@@ -1448,7 +1448,7 @@ FBalken* f, Image* bild, Text* name) // Saves an image to the file
                 datKpf->addImage(kpf->getTitel());
                 index = datKpf->getImageIndex(kpf->getTitel());
                 datKpf->speichern(outF);
-                LTDBDateiKopf* kpf_tmp = new LTDBDateiKopf();
+                LTDBFileHeader* kpf_tmp = new LTDBFileHeader();
                 kpf_tmp->laden(0, inF);
                 kpf_tmp->release();
                 __int64 pos_plus = outF->tellp() - inF->tellg();
@@ -1466,7 +1466,7 @@ FBalken* f, Image* bild, Text* name) // Saves an image to the file
                 }
                 kpf->speichern(outF); // save image header
                 LTDBBody* kpr
-                    = new LTDBBody(dynamic_cast<LTDBKopf*>(kpf->getThis()));
+                    = new LTDBBody(dynamic_cast<LTDBHeader*>(kpf->getThis()));
                 kpr->setImage(dynamic_cast<Image*>(bild->getThis()));
                 kpr->speichern(f, outF); // save image
                 kpf->release();
@@ -1475,8 +1475,8 @@ FBalken* f, Image* bild, Text* name) // Saves an image to the file
                 outF->close();
                 delete inF;
                 delete outF;
-                DateiRemove(dynamic_cast<Text*>(pfad->getThis()));
-                DateiUmbenennen(
+                FileRemove(dynamic_cast<Text*>(pfad->getThis()));
+                FileRename(
                     (Text*)pf_tmp, dynamic_cast<Text*>(pfad->getThis()));
             }
         }
@@ -1486,7 +1486,7 @@ FBalken* f, Image* bild, Text* name) // Saves an image to the file
     return warn;
 }
 
-RCArray<Text>* LTDBDatei::zImageListe() // Lists all images in the file
+RCArray<Text>* LTDBFile::zImageListe() // Lists all images in the file
 {
     if (!datKpf) leseDaten(0);
     if (datKpf) return datKpf->zImageListe();
@@ -1494,21 +1494,21 @@ RCArray<Text>* LTDBDatei::zImageListe() // Lists all images in the file
 }
 
 // constant
-Text* LTDBDatei::getPfad() const // Returns the path to the file
+Text* LTDBFile::getPfad() const // Returns the path to the file
 {
     return dynamic_cast<Text*>(pfad->getThis());
 }
 
-int LTDBDatei::getImageAnzahl() const
+int LTDBFile::getImageAnzahl() const
 {
     if (!datKpf) return 0;
     return datKpf->getbAnzahl();
 }
 
-bool LTDBDatei::istOffen() const // Checks if the file is open
+bool LTDBFile::istOffen() const // Checks if the file is open
 {
     if (!pfad) return 0;
-    return DateiExistiert(dynamic_cast<Text*>(pfad->getThis()));
+    return FileExists(dynamic_cast<Text*>(pfad->getThis()));
 }
 #ifdef WIN32
 // LTDS File format
@@ -1793,9 +1793,9 @@ unsigned char LTDSPixel::getA() const // returns alpha
     return alpha;
 }
 
-// Content of the LTDSDateiKopf class from FileSystem.h
+// Content of the LTDSFileHeader class from FileSystem.h
 // Constructor
-LTDSDateiKopf::LTDSDateiKopf()
+LTDSFileHeader::LTDSFileHeader()
     : ReferenceCounter(),
       sganzahl(0),
       gr(0),
@@ -1803,14 +1803,14 @@ LTDSDateiKopf::LTDSDateiKopf()
 {}
 
 // Destructor
-LTDSDateiKopf::~LTDSDateiKopf()
+LTDSFileHeader::~LTDSFileHeader()
 {
     delete[] gr;
     delete[] pos;
 }
 
 // non-constant
-void LTDSDateiKopf::laden(std::ifstream* inF) // Loads from inF
+void LTDSFileHeader::laden(std::ifstream* inF) // Loads from inF
 {
     if (inF->good() && inF->is_open())
     {
@@ -1829,7 +1829,7 @@ void LTDSDateiKopf::laden(std::ifstream* inF) // Loads from inF
     }
 }
 
-void LTDSDateiKopf::addSG(char sg) // Add font size
+void LTDSFileHeader::addSG(char sg) // Add font size
 {
     ++sganzahl;
     unsigned char* gr_tmp = gr;
@@ -1849,7 +1849,7 @@ void LTDSDateiKopf::addSG(char sg) // Add font size
     gr[sganzahl - 1] = sg;
 }
 
-void LTDSDateiKopf::removeSG(char sg) // Remove font size
+void LTDSFileHeader::removeSG(char sg) // Remove font size
 {
     bool hatsg = 0;
     int sgpos = 0;
@@ -1884,7 +1884,7 @@ void LTDSDateiKopf::removeSG(char sg) // Remove font size
 }
 
 // constant
-void LTDSDateiKopf::speichern(std::ofstream* outF) const // Saves to outF
+void LTDSFileHeader::speichern(std::ofstream* outF) const // Saves to outF
 {
     if (outF->is_open() && outF->good())
     {
@@ -1897,27 +1897,27 @@ void LTDSDateiKopf::speichern(std::ofstream* outF) const // Saves to outF
     }
 }
 
-unsigned char* LTDSDateiKopf::getSchriftGroesseList()
+unsigned char* LTDSFileHeader::getSchriftGroesseList()
 const // returns a list of stored font sizes
 {
     return gr;
 }
 
-int* LTDSDateiKopf::getPositionList()
+int* LTDSFileHeader::getPositionList()
 const // returns a position list of stored font sizes
 {
     return pos;
 }
 
-int LTDSDateiKopf::getSchriftGroesseAnzahl()
+int LTDSFileHeader::getSchriftGroesseAnzahl()
 const // returns the number of stored font sizes
 {
     return sganzahl;
 }
 
-// Content of the LTDSSchriftKopf class from FileSystem.h
+// Content of the LTDSFontHeader class from FileSystem.h
 // Constructor
-LTDSSchriftKopf::LTDSSchriftKopf()
+LTDSFontHeader::LTDSFontHeader()
     : ReferenceCounter(),
       schriftSize(0),
       zeichen(0),
@@ -1926,14 +1926,14 @@ LTDSSchriftKopf::LTDSSchriftKopf()
 {}
 
 // Destructor
-LTDSSchriftKopf::~LTDSSchriftKopf()
+LTDSFontHeader::~LTDSFontHeader()
 {
     delete[] pos;
     delete[] zeichen;
 }
 
 // non-constant
-void LTDSSchriftKopf::laden(std::ifstream* inF) // loads from inF
+void LTDSFontHeader::laden(std::ifstream* inF) // loads from inF
 {
     if (inF->good() && inF->is_open())
     {
@@ -1952,19 +1952,19 @@ void LTDSSchriftKopf::laden(std::ifstream* inF) // loads from inF
     }
 }
 
-void LTDSSchriftKopf::setSchriftgroesse(
+void LTDSFontHeader::setSchriftgroesse(
 unsigned char gr) // set font size
 {
     schriftSize = gr;
 }
 
-void LTDSSchriftKopf::setZeichenAlphabet(
+void LTDSFontHeader::setZeichenAlphabet(
 Alphabet* alphabet) // sets the characters from alphabet
 {
     int count = 0;
     for (int i = 0; i < 256; ++i)
     {
-        Buchstabe* zeich = alphabet->zBuchstabe(i);
+        Character* zeich = alphabet->zCharacter(i);
         if (zeich) ++count;
     }
     delete[] zeichen;
@@ -1976,7 +1976,7 @@ Alphabet* alphabet) // sets the characters from alphabet
     count = 0;
     for (int i = 0; i < 256; ++i)
     {
-        Buchstabe* zeich = alphabet->getBuchstabe(i);
+        Character* zeich = alphabet->getCharacter(i);
         if (zeich)
         {
             zeichen[count] = i;
@@ -1989,7 +1989,7 @@ Alphabet* alphabet) // sets the characters from alphabet
     alphabet->release();
 }
 
-void LTDSSchriftKopf::addZeichen(unsigned char zeichen) // Add character
+void LTDSFontHeader::addZeichen(unsigned char zeichen) // Add character
 {
     ++zeichenAnzahl;
     unsigned char* zeichen_tmp = this->zeichen;
@@ -2008,7 +2008,7 @@ void LTDSSchriftKopf::addZeichen(unsigned char zeichen) // Add character
     pos[zeichenAnzahl] = 0;
 }
 
-void LTDSSchriftKopf::removeZeichen(unsigned char zeich) // Remove character
+void LTDSFontHeader::removeZeichen(unsigned char zeich) // Remove character
 {
     bool hatZ = 0;
     int zPos = 0;
@@ -2042,7 +2042,7 @@ void LTDSSchriftKopf::removeZeichen(unsigned char zeich) // Remove character
 }
 
 // constant
-void LTDSSchriftKopf::speichern(
+void LTDSFontHeader::speichern(
 std::ofstream* outF) const // saves to outF
 {
     if (outF->good() && outF->is_open())
@@ -2058,38 +2058,38 @@ std::ofstream* outF) const // saves to outF
 }
 
 unsigned char
-LTDSSchriftKopf::getSchriftGroesse() const // returns the font size
+LTDSFontHeader::getSchriftGroesse() const // returns the font size
 {
     return schriftSize;
 }
 
 unsigned char
-LTDSSchriftKopf::getZeichenAnzahl() const // returns the character count
+LTDSFontHeader::getZeichenAnzahl() const // returns the character count
 {
     return zeichenAnzahl;
 }
 
-int* LTDSSchriftKopf::getPositionen()
+int* LTDSFontHeader::getPositionen()
 const // returns the character positions
 {
     return pos;
 }
 
-unsigned char* LTDSSchriftKopf::getZeichen() const // returns the characters
+unsigned char* LTDSFontHeader::getZeichen() const // returns the characters
 {
     return zeichen;
 }
 
-// Content of the LTDSBuchstabenKopf class from FileSystem.h
+// Content of the LTDSCharacterHeader class from FileSystem.h
 // Constructor
-LTDSBuchstabenKopf::LTDSBuchstabenKopf()
+LTDSCharacterHeader::LTDSCharacterHeader()
     : ReferenceCounter(),
       zeichen(0),
       size(0, 0)
 {}
 
 // non-constant
-void LTDSBuchstabenKopf::laden(std::ifstream* inF) // loads from inF
+void LTDSCharacterHeader::laden(std::ifstream* inF) // loads from inF
 {
     if (inF->good() && inF->is_open())
     {
@@ -2099,21 +2099,21 @@ void LTDSBuchstabenKopf::laden(std::ifstream* inF) // loads from inF
     }
 }
 
-void LTDSBuchstabenKopf::init(unsigned char zeichen,
+void LTDSCharacterHeader::init(unsigned char zeichen,
 const Punkt& groesse) // initialization (for saving)
 {
     this->zeichen = zeichen;
     this->size = groesse;
 }
 
-void LTDSBuchstabenKopf::init(unsigned char zeichen, int br, int hoe)
+void LTDSCharacterHeader::init(unsigned char zeichen, int br, int hoe)
 {
     this->zeichen = zeichen;
     size.x = br, size.y = hoe;
 }
 
 // constant
-void LTDSBuchstabenKopf::speichern(
+void LTDSCharacterHeader::speichern(
 std::ofstream* outF) const // saves to outF
 {
     if (outF->good() && outF->is_open())
@@ -2124,53 +2124,53 @@ std::ofstream* outF) const // saves to outF
     }
 }
 
-unsigned char LTDSBuchstabenKopf::getZeichen() const // returns the character
+unsigned char LTDSCharacterHeader::getZeichen() const // returns the character
 {
     return zeichen;
 }
 
-int LTDSBuchstabenKopf::getBreite() const // returns the width
+int LTDSCharacterHeader::getBreite() const // returns the width
 {
     return size.x;
 }
 
-int LTDSBuchstabenKopf::getHoehe() const // returns the height
+int LTDSCharacterHeader::getHoehe() const // returns the height
 {
     return size.y;
 }
 
-const Punkt& LTDSBuchstabenKopf::getGroesse() const // returns the size
+const Punkt& LTDSCharacterHeader::getGroesse() const // returns the size
 {
     return size;
 }
 
-// Content of the LTDSBuchstabenKoerper class from FileSystem.h
+// Content of the LTDSCharacterBody class from FileSystem.h
 // Constructor
-LTDSBuchstabenKoerper::LTDSBuchstabenKoerper(LTDSBuchstabenKopf* kopf)
+LTDSCharacterBody::LTDSCharacterBody(LTDSCharacterHeader* kopf)
     : ReferenceCounter(),
       size(kopf->getGroesse()),
       zeichen(kopf->getZeichen()),
-      buchstabe(new Buchstabe())
+      buchstabe(new Character())
 {
-    buchstabe->NeuBuchstabe(size);
+    buchstabe->NewCharacter(size);
     kopf->release();
 }
 
 // Destructor
-LTDSBuchstabenKoerper::~LTDSBuchstabenKoerper()
+LTDSCharacterBody::~LTDSCharacterBody()
 {
     if (buchstabe) buchstabe->release();
 }
 
 // non-constant
-void LTDSBuchstabenKoerper::setBuchstabe(
-    Buchstabe* zeichen) // sets the character
+void LTDSCharacterBody::setCharacter(
+    Character* zeichen) // sets the character
 {
     if (buchstabe) buchstabe->release();
     buchstabe = zeichen;
 }
 
-void LTDSBuchstabenKoerper::laden(std::ifstream* inF) // Loads from inF
+void LTDSCharacterBody::laden(std::ifstream* inF) // Loads from inF
 {
     if (inF->good() && inF->is_open())
     {
@@ -2204,7 +2204,7 @@ void LTDSBuchstabenKoerper::laden(std::ifstream* inF) // Loads from inF
 }
 
 // constant
-void LTDSBuchstabenKoerper::speichern(
+void LTDSCharacterBody::speichern(
 std::ofstream* outF) const // saves to outF
 {
     if (outF->good() && outF->is_open())
@@ -2253,56 +2253,56 @@ std::ofstream* outF) const // saves to outF
     }
 }
 
-Buchstabe*
-LTDSBuchstabenKoerper::getBuchstabe() const // returns the character
+Character*
+LTDSCharacterBody::getCharacter() const // returns the character
 {
-    return dynamic_cast<Buchstabe*>(buchstabe->getThis());
+    return dynamic_cast<Character*>(buchstabe->getThis());
 }
 
 unsigned char
-LTDSBuchstabenKoerper::getZeichen() const // returns the character
+LTDSCharacterBody::getZeichen() const // returns the character
 {
     return zeichen;
 }
 
-// Content of the LTDSDatei class from FileSystem.h
+// Content of the LTDSFile class from FileSystem.h
 // Constructor
-LTDSDatei::LTDSDatei()
+LTDSFile::LTDSFile()
     : ReferenceCounter(),
       pfad(new Text()),
       dateiKopf(0)
 {}
 
 // Destructor
-LTDSDatei::~LTDSDatei()
+LTDSFile::~LTDSFile()
 {
     if (dateiKopf) dateiKopf->release();
     pfad->release();
 }
 
 // non-constant
-void LTDSDatei::setPfad(Text* txt) // sets the path to the file
+void LTDSFile::setPfad(Text* txt) // sets the path to the file
 {
-    if (dateiKopf) dateiKopf = (LTDSDateiKopf*)dateiKopf->release();
+    if (dateiKopf) dateiKopf = (LTDSFileHeader*)dateiKopf->release();
     pfad->setText(txt->getText());
     txt->release();
 }
 
-void LTDSDatei::leseDaten() // reads the file header
+void LTDSFile::leseDaten() // reads the file header
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return;
     if (dateiKopf) dateiKopf->release();
-    dateiKopf = new LTDSDateiKopf();
+    dateiKopf = new LTDSFileHeader();
     std::ifstream* inF = new std::ifstream(pfad->getText(), std::ios::binary);
     dateiKopf->laden(inF);
     inF->close();
     delete inF;
 }
 
-void LTDSDatei::addSchriftgroesse(
+void LTDSFile::addSchriftgroesse(
     Alphabet* alphabet) // adds a font size
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(
+    if (!FileExists(dynamic_cast<Text*>(
             pfad->getThis()))) // check if the file exists
         return;
     if (!dateiKopf) // check if the file header has been read
@@ -2342,8 +2342,8 @@ void LTDSDatei::addSchriftgroesse(
     for (int i = 0; i < sganzahl;
         ++i) // update character positions of all font sizes
     {
-        LTDSSchriftKopf* sgKpf_tmp
-            = new LTDSSchriftKopf(); // font size header
+        LTDSFontHeader* sgKpf_tmp
+            = new LTDSFontHeader(); // font size header
         sgKpf_tmp->laden(inF);       // load from old file
         int* zeichP_tmp
             = sgKpf_tmp
@@ -2380,8 +2380,8 @@ void LTDSDatei::addSchriftgroesse(
         sgPosList[i] += 5;
     dateiKopf->speichern(outF); // save updated file header
     outF->seekp(sgPosList[sganzahl], std::ios::beg);
-    LTDSSchriftKopf* sgkopf
-        = new LTDSSchriftKopf(); // header of the new font size
+    LTDSFontHeader* sgkopf
+        = new LTDSFontHeader(); // header of the new font size
     sgkopf->setZeichenAlphabet(dynamic_cast<Alphabet*>(
         alphabet->getThis())); // initialize font size header
     sgkopf->speichern(outF);   // save font size header
@@ -2391,21 +2391,21 @@ void LTDSDatei::addSchriftgroesse(
     int count = 0;
     for (int i = 0; i < 256; ++i)
     {
-        Buchstabe* zeich = alphabet->getBuchstabe(i);
+        Character* zeich = alphabet->getCharacter(i);
         if (zeich)
         {
             BuchstabenPosList[count]
                 = (int)outF->tellp(); // set character position
-            LTDSBuchstabenKopf* zeichKpf
-                = new LTDSBuchstabenKopf(); // character header
+            LTDSCharacterHeader* zeichKpf
+                = new LTDSCharacterHeader(); // character header
             zeichKpf->init(i, zeich->getBreite(), zeich->getHeight());
             zeichKpf->speichern(outF); // save character header
-            LTDSBuchstabenKoerper* zeichKoerp
-                = new LTDSBuchstabenKoerper(dynamic_cast<LTDSBuchstabenKopf*>(
+            LTDSCharacterBody* zeichKoerp
+                = new LTDSCharacterBody(dynamic_cast<LTDSCharacterHeader*>(
                     zeichKpf->getThis())); // character body
             zeichKpf->release();
-            zeichKoerp->setBuchstabe(
-                dynamic_cast<Buchstabe*>(zeich->getThis()));
+            zeichKoerp->setCharacter(
+                dynamic_cast<Character*>(zeich->getThis()));
             zeichKoerp->speichern(outF); // save character body
             zeich->release();
             ++count;
@@ -2417,8 +2417,8 @@ void LTDSDatei::addSchriftgroesse(
     Text* pfad2 = new Text();
     pfad2->setText(pfad->getText());
     pfad->remove(pfad->getLength() - 1, pfad->getLength());
-    DateiRemove(dynamic_cast<Text*>(pfad->getThis())); // delete old file
-    DateiUmbenennen(dynamic_cast<Text*>(pfad2->getThis()),
+    FileRemove(dynamic_cast<Text*>(pfad->getThis())); // delete old file
+    FileRename(dynamic_cast<Text*>(pfad2->getThis()),
         dynamic_cast<Text*>(
             pfad->getThis())); // rename new file to old
     pfad2->release();          // free memory
@@ -2428,11 +2428,11 @@ void LTDSDatei::addSchriftgroesse(
     alphabet->release();
 }
 
-void LTDSDatei::addBuchstabe(int gr,
-    Buchstabe* zeich,
+void LTDSFile::addBuchstabe(int gr,
+    Character* zeich,
     unsigned char zeichen) // Adds a character to a font size
 {
-    if (!DateiExistiert(
+    if (!FileExists(
             dynamic_cast<Text*>(pfad->getThis()))) // check if file exists
     {
         zeich->release();
@@ -2477,8 +2477,8 @@ void LTDSDatei::addBuchstabe(int gr,
         for (int i = 0; i < sgAnzahl;
             ++i) // update character positions of all font sizes
         {
-            LTDSSchriftKopf* sgKpf_tmp
-                = new LTDSSchriftKopf(); // font size header
+            LTDSFontHeader* sgKpf_tmp
+                = new LTDSFontHeader(); // font size header
             sgKpf_tmp->laden(inF);       // load from old file
             int* zeichP_tmp
                 = sgKpf_tmp
@@ -2515,22 +2515,22 @@ void LTDSDatei::addBuchstabe(int gr,
             sgPosList[i] += 5;
         dateiKopf->speichern(outF); // save updated file header
         outF->seekp(sgPosList[sgAnzahl], std::ios::beg);
-        LTDSSchriftKopf* sgKpf
-            = new LTDSSchriftKopf(); // initialize font size header
+        LTDSFontHeader* sgKpf
+            = new LTDSFontHeader(); // initialize font size header
         sgKpf->setSchriftgroesse(gr);
         sgKpf->addZeichen(zeichen);
         sgKpf->getPositionen()[0] = (int)outF->tellp() + 7;
         sgKpf->speichern(outF); // save font size header
         sgKpf->release();
-        LTDSBuchstabenKopf* zeichKpf
-            = new LTDSBuchstabenKopf(); // character header
+        LTDSCharacterHeader* zeichKpf
+            = new LTDSCharacterHeader(); // character header
         zeichKpf->init(zeichen, zeich->getSize());
         zeichKpf->speichern(outF); // save character header
-        LTDSBuchstabenKoerper* zeichKoerp
-            = new LTDSBuchstabenKoerper(dynamic_cast<LTDSBuchstabenKopf*>(
+        LTDSCharacterBody* zeichKoerp
+            = new LTDSCharacterBody(dynamic_cast<LTDSCharacterHeader*>(
                 zeichKpf->getThis())); // character body
         zeichKpf->release();
-        zeichKoerp->setBuchstabe(dynamic_cast<Buchstabe*>(zeich->getThis()));
+        zeichKoerp->setCharacter(dynamic_cast<Character*>(zeich->getThis()));
         zeichKoerp->speichern(outF); // save character body
         zeichKoerp->release();
     }
@@ -2548,7 +2548,7 @@ void LTDSDatei::addBuchstabe(int gr,
             inF->read(&byte, 1);
             outF->write(&byte, 1);
         }
-        LTDSSchriftKopf* sgKpf = new LTDSSchriftKopf(); // font size header
+        LTDSFontHeader* sgKpf = new LTDSFontHeader(); // font size header
         sgKpf->laden(inF);
         for (int i = 0; i < sgKpf->getZeichenAnzahl(); ++i)
             sgKpf->getPositionen()[i] += 5;
@@ -2572,14 +2572,14 @@ void LTDSDatei::addBuchstabe(int gr,
             inF->read(&byte, 1);
             outF->write(&byte, 1);
         }
-        LTDSBuchstabenKopf* zeichKpf = new LTDSBuchstabenKopf(); // character header
+        LTDSCharacterHeader* zeichKpf = new LTDSCharacterHeader(); // character header
         zeichKpf->init(zeichen, zeich->getSize());
         zeichKpf->speichern(outF); // save character header
-        LTDSBuchstabenKoerper* zeichKoerp
-            = new LTDSBuchstabenKoerper(dynamic_cast<LTDSBuchstabenKopf*>(
+        LTDSCharacterBody* zeichKoerp
+            = new LTDSCharacterBody(dynamic_cast<LTDSCharacterHeader*>(
                 zeichKpf->getThis())); // character body
         zeichKpf->release();
-        zeichKoerp->setBuchstabe(dynamic_cast<Buchstabe*>(zeich->getThis()));
+        zeichKoerp->setCharacter(dynamic_cast<Character*>(zeich->getThis()));
         zeichKoerp->speichern(outF); // save character body
         zeichKoerp->release();
         int nowPos = (int)outF->tellp();
@@ -2592,8 +2592,8 @@ void LTDSDatei::addBuchstabe(int gr,
         for (int i = sgNum + 1; i < sgAnzahl;
             ++i) // update remaining font sizes
         {
-            LTDSSchriftKopf* sgKpf_tmp
-                = new LTDSSchriftKopf(); // font size header
+            LTDSFontHeader* sgKpf_tmp
+                = new LTDSFontHeader(); // font size header
             sgKpf_tmp->laden(inF);       // load from old file
             int* zeichP_tmp
                 = sgKpf_tmp
@@ -2629,8 +2629,8 @@ void LTDSDatei::addBuchstabe(int gr,
     outF->close();
     Text* pfad2 = new Text(pfad->getText());
     pfad->remove(pfad->getLength() - 1, pfad->getLength());
-    DateiRemove(dynamic_cast<Text*>(pfad->getThis())); // delete old file
-    DateiUmbenennen(dynamic_cast<Text*>(pfad2->getThis()),
+    FileRemove(dynamic_cast<Text*>(pfad->getThis())); // delete old file
+    FileRename(dynamic_cast<Text*>(pfad2->getThis()),
         dynamic_cast<Text*>(pfad->getThis())); // rename new file to old
     pfad2->release();                          // free memory
     delete inF;
@@ -2638,10 +2638,10 @@ void LTDSDatei::addBuchstabe(int gr,
     zeich->release();
 }
 
-void LTDSDatei::loescheSchrifrGroesse(
+void LTDSFile::loescheSchrifrGroesse(
     int gr) // Deletes a font size from the file
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(
+    if (!FileExists(dynamic_cast<Text*>(
             pfad->getThis()))) // check if file exists
         return;
     if (!dateiKopf) // check if the file header was loaded
@@ -2674,8 +2674,8 @@ void LTDSDatei::loescheSchrifrGroesse(
     for (int i = 0; i < sgNum; ++i) // update font sizes before the one
                                     // being deleted
     {
-        LTDSSchriftKopf* sgKpf_tmp
-            = new LTDSSchriftKopf(); // font size header
+        LTDSFontHeader* sgKpf_tmp
+            = new LTDSFontHeader(); // font size header
         sgKpf_tmp->laden(inF);       // load font size header
         int* zeichPosLTmp = sgKpf_tmp->getPositionen(); // character positions
         unsigned char zeichATmp
@@ -2698,8 +2698,8 @@ void LTDSDatei::loescheSchrifrGroesse(
     for (int i = sgNum + 1; i < sgAnzahl;
         ++i) // font sizes after the one being deleted
     {
-        LTDSSchriftKopf* sgKpf_tmp
-            = new LTDSSchriftKopf(); // font size header
+        LTDSFontHeader* sgKpf_tmp
+            = new LTDSFontHeader(); // font size header
         sgKpf_tmp->laden(inF);       // load font size header
         int* zeichPosLTmp = sgKpf_tmp->getPositionen(); // character positions
         unsigned char zeichATmp
@@ -2735,18 +2735,18 @@ void LTDSDatei::loescheSchrifrGroesse(
     outF->close();
     Text* pfad2 = new Text(pfad->getText());
     pfad->remove(pfad->getLength() - 1, pfad->getLength());
-    DateiRemove(dynamic_cast<Text*>(pfad->getThis())); // delete old file
-    DateiUmbenennen(dynamic_cast<Text*>(pfad2->getThis()),
+    FileRemove(dynamic_cast<Text*>(pfad->getThis())); // delete old file
+    FileRename(dynamic_cast<Text*>(pfad2->getThis()),
         dynamic_cast<Text*>(pfad->getThis())); // rename new file to old
     pfad2->release();
     delete inF;
     delete outF;
 }
 
-void LTDSDatei::loescheBuchstabe(
+void LTDSFile::loescheBuchstabe(
     int gr, unsigned char zeichen) // Deletes a character from the file
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(
+    if (!FileExists(dynamic_cast<Text*>(
             pfad->getThis()))) // check if the file exists
         return;
     if (!dateiKopf) // check if the file header was read
@@ -2779,7 +2779,7 @@ void LTDSDatei::loescheBuchstabe(
     dateiKopf->speichern(outF); // save file header
     for (int i = 0; i < sgAnzahl; ++i)
     {
-        LTDSSchriftKopf* sgKopf = new LTDSSchriftKopf(); // font header
+        LTDSFontHeader* sgKopf = new LTDSFontHeader(); // font header
         sgKopf->laden(inF);                              // load font header
         unsigned char sgZeichAnzahl
             = sgKopf->getZeichenAnzahl();                    // character count
@@ -2803,7 +2803,7 @@ void LTDSDatei::loescheBuchstabe(
                 outF->close();
                 delete inF;
                 delete outF;
-                DateiRemove(dynamic_cast<Text*>(pfad->getThis()));
+                FileRemove(dynamic_cast<Text*>(pfad->getThis()));
                 pfad->remove(pfad->getLength() - 1, pfad->getLength());
                 return; // abort
             }
@@ -2891,8 +2891,8 @@ void LTDSDatei::loescheBuchstabe(
     outF->close();
     Text* pfad2 = new Text(pfad->getText());
     pfad->remove(pfad->getLength() - 1, pfad->getLength());
-    DateiRemove(dynamic_cast<Text*>(pfad->getThis())); // delete old file
-    DateiUmbenennen(dynamic_cast<Text*>(pfad2->getThis()),
+    FileRemove(dynamic_cast<Text*>(pfad->getThis())); // delete old file
+    FileRename(dynamic_cast<Text*>(pfad2->getThis()),
         dynamic_cast<Text*>(
             pfad->getThis())); // rename new file to old
     pfad2->release();          // free memory
@@ -2900,35 +2900,35 @@ void LTDSDatei::loescheBuchstabe(
     delete outF;
 }
 
-void LTDSDatei::loescheDatei() // Deletes the entire file
+void LTDSFile::deleteFile() // Deletes the entire file
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return;
     if (!dateiKopf) leseDaten();
-    DateiRemove(dynamic_cast<Text*>(pfad->getThis()));
+    FileRemove(dynamic_cast<Text*>(pfad->getThis()));
 }
 
-void LTDSDatei::erstelleDatei() // creates the file
+void LTDSFile::createFile() // creates the file
 {
-    DateiPfadErstellen(dynamic_cast<Text*>(pfad->getThis()));
+    FilePathCreate(dynamic_cast<Text*>(pfad->getThis()));
     if (dateiKopf) dateiKopf->release();
-    dateiKopf = new LTDSDateiKopf();
+    dateiKopf = new LTDSFileHeader();
     std::ofstream* outF = new std::ofstream(pfad->getText(), std::ios::binary);
     dateiKopf->speichern(outF);
     outF->close();
     delete outF;
 }
 
-void LTDSDatei::saveFont(
+void LTDSFile::saveFont(
 Font* schrift) // Saves the provided font
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis())))
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis())))
     {
         schrift->release();
         return;
     }
-    loescheDatei();
+    deleteFile();
     if (dateiKopf) dateiKopf->release();
-    dateiKopf = new LTDSDateiKopf();
+    dateiKopf = new LTDSFileHeader();
     for (int i = 0; i < 256; ++i)
     {
         Alphabet* alp = schrift->getAlphabet((unsigned char)i);
@@ -2946,22 +2946,22 @@ Font* schrift) // Saves the provided font
         if (alp)
         {
             dateiKopf->getPositionList()[i] = (int)outF->tellp();
-            LTDSSchriftKopf* sgKpf = new LTDSSchriftKopf();
+            LTDSFontHeader* sgKpf = new LTDSFontHeader();
             sgKpf->setZeichenAlphabet(dynamic_cast<Alphabet*>(alp->getThis()));
             sgKpf->speichern(outF);
             for (int i1 = 0; i1 < sgKpf->getZeichenAnzahl(); ++i1)
             {
                 sgKpf->getPositionen()[i1] = (int)outF->tellp();
-                LTDSBuchstabenKopf* zeichKpf = new LTDSBuchstabenKopf();
-                Buchstabe* zeichen = alp->getBuchstabe(sgKpf->getZeichen()[i1]);
+                LTDSCharacterHeader* zeichKpf = new LTDSCharacterHeader();
+                Character* zeichen = alp->getCharacter(sgKpf->getZeichen()[i1]);
                 zeichKpf->init(sgKpf->getZeichen()[i1],
                     zeichen->getBreite(),
                     zeichen->getHeight());
                 zeichKpf->speichern(outF);
-                LTDSBuchstabenKoerper* zeichKoerp = new LTDSBuchstabenKoerper(
-                    dynamic_cast<LTDSBuchstabenKopf*>(zeichKpf->getThis()));
-                zeichKoerp->setBuchstabe(
-                    dynamic_cast<Buchstabe*>(zeichen->getThis()));
+                LTDSCharacterBody* zeichKoerp = new LTDSCharacterBody(
+                    dynamic_cast<LTDSCharacterHeader*>(zeichKpf->getThis()));
+                zeichKoerp->setCharacter(
+                    dynamic_cast<Character*>(zeichen->getThis()));
                 zeichKoerp->speichern(outF);
                 zeichKoerp->release();
                 zeichen->release();
@@ -2983,28 +2983,28 @@ Font* schrift) // Saves the provided font
 }
 
 // constant
-Font* LTDSDatei::loadFont() // returns the loaded font
+Font* LTDSFile::loadFont() // returns the loaded font
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     Font* ret = new Font();
     std::ifstream* inF = new std::ifstream(pfad->getText(), std::ios::binary);
     inF->seekg(dateiKopf->getPositionList()[0], std::ios::beg);
     for (int i = 0; i < dateiKopf->getSchriftGroesseAnzahl(); ++i)
     {
-        LTDSSchriftKopf* sgKpf = new LTDSSchriftKopf();
+        LTDSFontHeader* sgKpf = new LTDSFontHeader();
         sgKpf->laden(inF);
         Alphabet* alphabet = new Alphabet();
         alphabet->setSchriftSize(sgKpf->getSchriftGroesse());
         for (int i1 = 0; i1 < sgKpf->getZeichenAnzahl(); ++i1)
         {
-            LTDSBuchstabenKopf* zeichKpf = new LTDSBuchstabenKopf();
+            LTDSCharacterHeader* zeichKpf = new LTDSCharacterHeader();
             zeichKpf->laden(inF);
-            LTDSBuchstabenKoerper* zeichKoerp = new LTDSBuchstabenKoerper(
-                dynamic_cast<LTDSBuchstabenKopf*>(zeichKpf->getThis()));
+            LTDSCharacterBody* zeichKoerp = new LTDSCharacterBody(
+                dynamic_cast<LTDSCharacterHeader*>(zeichKpf->getThis()));
             zeichKoerp->laden(inF);
-            alphabet->setBuchstabe(
-                zeichKpf->getZeichen(), zeichKoerp->getBuchstabe());
+            alphabet->setCharacter(
+                zeichKpf->getZeichen(), zeichKoerp->getCharacter());
             zeichKoerp->release();
             zeichKpf->release();
         }
@@ -3017,11 +3017,11 @@ Font* LTDSDatei::loadFont() // returns the loaded font
     return ret;
 }
 
-Alphabet* LTDSDatei::ladeAlphabet(
+Alphabet* LTDSFile::ladeAlphabet(
 int schriftgroesse) // returns a loaded font with only the specified
                     // font size
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     Alphabet* ret = 0;
     int sgNum = -1;
@@ -3039,16 +3039,16 @@ int schriftgroesse) // returns a loaded font with only the specified
     ret->setSchriftSize(schriftgroesse);
     std::ifstream* inF = new std::ifstream(pfad->getText(), std::ios::binary);
     inF->seekg(dateiKopf->getPositionList()[sgNum], std::ios::beg);
-    LTDSSchriftKopf* sgKpf = new LTDSSchriftKopf();
+    LTDSFontHeader* sgKpf = new LTDSFontHeader();
     sgKpf->laden(inF);
     for (int i = 0; i < sgKpf->getZeichenAnzahl(); ++i)
     {
-        LTDSBuchstabenKopf* sgZKpf = new LTDSBuchstabenKopf();
+        LTDSCharacterHeader* sgZKpf = new LTDSCharacterHeader();
         sgZKpf->laden(inF);
-        LTDSBuchstabenKoerper* sgZKoerp = new LTDSBuchstabenKoerper(
-            dynamic_cast<LTDSBuchstabenKopf*>(sgZKpf->getThis()));
+        LTDSCharacterBody* sgZKoerp = new LTDSCharacterBody(
+            dynamic_cast<LTDSCharacterHeader*>(sgZKpf->getThis()));
         sgZKoerp->laden(inF);
-        ret->setBuchstabe(sgZKpf->getZeichen(), sgZKoerp->getBuchstabe());
+        ret->setCharacter(sgZKpf->getZeichen(), sgZKoerp->getCharacter());
         sgZKoerp->release();
         sgZKpf->release();
     }
@@ -3058,12 +3058,12 @@ int schriftgroesse) // returns a loaded font with only the specified
     return ret;
 }
 
-Buchstabe* LTDSDatei::ladeBuchstabe(int schriftgroesse,
+Character* LTDSFile::loadCharacter(int schriftgroesse,
 unsigned char zeichen) // Loads a specific character
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
-    Buchstabe* ret = 0;
+    Character* ret = 0;
     int sgNum = -1;
     for (int i = 0; i < dateiKopf->getSchriftGroesseAnzahl(); ++i)
     {
@@ -3076,7 +3076,7 @@ unsigned char zeichen) // Loads a specific character
     if (sgNum == -1) return 0;
     std::ifstream* inF = new std::ifstream(pfad->getText(), std::ios::binary);
     inF->seekg(dateiKopf->getPositionList()[sgNum], std::ios::beg);
-    LTDSSchriftKopf* sgKpf = new LTDSSchriftKopf();
+    LTDSFontHeader* sgKpf = new LTDSFontHeader();
     sgKpf->laden(inF);
     int sgZNum = -1;
     for (int i = 0; i < sgKpf->getZeichenAnzahl(); ++i)
@@ -3090,12 +3090,12 @@ unsigned char zeichen) // Loads a specific character
     if (sgZNum != -1)
     {
         inF->seekg(sgKpf->getPositionen()[sgZNum], std::ios::beg);
-        LTDSBuchstabenKopf* sgZKpf = new LTDSBuchstabenKopf();
+        LTDSCharacterHeader* sgZKpf = new LTDSCharacterHeader();
         sgZKpf->laden(inF);
-        LTDSBuchstabenKoerper* sgZKoerp = new LTDSBuchstabenKoerper(
-            dynamic_cast<LTDSBuchstabenKopf*>(sgZKpf->getThis()));
+        LTDSCharacterBody* sgZKoerp = new LTDSCharacterBody(
+            dynamic_cast<LTDSCharacterHeader*>(sgZKpf->getThis()));
         sgZKoerp->laden(inF);
-        ret = sgZKoerp->getBuchstabe();
+        ret = sgZKoerp->getCharacter();
         sgZKoerp->release();
         sgZKpf->release();
     }
@@ -3109,31 +3109,31 @@ unsigned char zeichen) // Loads a specific character
     return ret;
 }
 
-Text* LTDSDatei::getPfad() const // returns the file path
+Text* LTDSFile::getPfad() const // returns the file path
 {
     return dynamic_cast<Text*>(pfad->getThis());
 }
 
-int LTDSDatei::getAnzahlSchriftgroessen()
+int LTDSFile::getAnzahlSchriftgroessen()
 const // returns the number of font sizes from the file
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     return dateiKopf->getSchriftGroesseAnzahl();
 }
 
-unsigned char* LTDSDatei::getSchriftGroessen()
+unsigned char* LTDSFile::getSchriftGroessen()
 const // returns an array of font sizes
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     return dateiKopf->getSchriftGroesseList();
 }
 
-unsigned char LTDSDatei::getAnzahlBuchstaben(
+unsigned char LTDSFile::getAnzahlBuchstaben(
 int sg) // returns the number of stored characters for a font size
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     int ret = 0;
     unsigned char* groessen = dateiKopf->getSchriftGroesseList();
@@ -3150,7 +3150,7 @@ int sg) // returns the number of stored characters for a font size
     if (grpos != -1)
     {
         int* grposlist = dateiKopf->getPositionList();
-        LTDSSchriftKopf* sgkpf = new LTDSSchriftKopf();
+        LTDSFontHeader* sgkpf = new LTDSFontHeader();
         std::ifstream* inF
             = new std::ifstream(pfad->getText(), std::ios::binary);
         inF->seekg(grposlist[grpos], std::ios::beg);
@@ -3163,10 +3163,10 @@ int sg) // returns the number of stored characters for a font size
     return ret;
 }
 
-unsigned char* LTDSDatei::getBuchstaben(
+unsigned char* LTDSFile::getBuchstaben(
 int sg) // returns an array of characters for a font size
 {
-    if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return 0;
+    if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     unsigned char* ret = 0;
     unsigned char* groessen = dateiKopf->getSchriftGroesseList();
@@ -3183,7 +3183,7 @@ int sg) // returns an array of characters for a font size
     if (grpos != -1)
     {
         int* grposlist = dateiKopf->getPositionList();
-        LTDSSchriftKopf* sgkpf = new LTDSSchriftKopf();
+        LTDSFontHeader* sgkpf = new LTDSFontHeader();
         std::ifstream* inF
             = new std::ifstream(pfad->getText(), std::ios::binary);
         inF->seekg(grposlist[grpos], std::ios::beg);

FileSystem.h

@@ -1,5 +1,5 @@
-#ifndef DateiSystem_H
-#define DateiSystem_H
+#ifndef FileSystem_H
+#define FileSystem_H
 
 #include <fstream>
 
@@ -10,23 +10,23 @@ namespace Framework
 {
     class Image;    //! Image.h
     class Text;    //! Text.h
-    class FBalken; //! Progress.h
+    class ProgressBar; //! Progress.h
 #ifdef WIN32
-    class Buchstabe; //! Font.h
+    class Character; //! Font.h
     class Alphabet;  //! Font.h
     class Font;   //! Font.h
 #endif
     class LTDBPixel; //! from this file
-    class LTDBKopf;  //! from this file
+    class LTDBHeader;  //! from this file
     class LTDBBody;  //! from this file
-    class LTDBDatei; //! from this file
+    class LTDBFile; //! from this file
     class LTDSPixel; //! from this file
 #ifdef WIN32
-    class LTDSDateiKopf;        //! from this file
-    class LTDSSchriftKopf;      //! from this file
-    class LTDSBuchstabenKopf;   //! from this file
-    class LTDSBuchstabenKoerper; //! from this file
-    class LTDSDatei;            //! from this file
+    class LTDSFileHeader;        //! from this file
+    class LTDSFontHeader;      //! from this file
+    class LTDSCharacterHeader;   //! from this file
+    class LTDSCharacterBody; //! from this file
+    class LTDSFile;            //! from this file
 #endif
 
     //! LTDB File format --- Used for storing multiple images in one file.
@@ -104,7 +104,7 @@ namespace Framework
 
     //! The header of the LTDB file format. Stores information about all
     //! saved images
-    class LTDBDateiKopf : public virtual ReferenceCounter
+    class LTDBFileHeader : public virtual ReferenceCounter
     {
     private:
         RCArray<Text>* bilder;
@@ -113,9 +113,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT LTDBDateiKopf();
+        DLLEXPORT LTDBFileHeader();
         //! Destructor
-        DLLEXPORT ~LTDBDateiKopf();
+        DLLEXPORT ~LTDBFileHeader();
         //! Removes an image from the file header
         //! \param i The index of the image to remove
         DLLEXPORT void removeImage(int i);
@@ -137,7 +137,7 @@ namespace Framework
         //! \param f A pointer to a progress bar to use for loading. Can be 0.
         //! \param inF The opened ifstream of the LTDB file with the read
         //! position already pointing to the first byte of the file header.
-        DLLEXPORT void laden(FBalken* f, std::ifstream* inF);
+        DLLEXPORT void laden(ProgressBar* f, std::ifstream* inF);
         //! Saves the file header to an LTDB file
         //! \param outF The opened ofstream of the LTDB file with the write
         //! position already pointing to the first byte of the file header.
@@ -170,7 +170,7 @@ namespace Framework
     };
 
     //! Information stored in the LTDB file header for a single image
-    class LTDBKopf : public virtual ReferenceCounter
+    class LTDBHeader : public virtual ReferenceCounter
     {
     private:
         __int64 a; //! The LTDB file header is at most 104 bits long
@@ -179,7 +179,7 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT LTDBKopf();
+        DLLEXPORT LTDBHeader();
         //! Loads information about an image
         //! \param f The opened ifstream of the LTDB file pointing to the
         //! correct position
@@ -232,20 +232,20 @@ namespace Framework
         //! Constructor
         //! \param k The LTDB header of the image containing information about
         //! the size of the image
-        DLLEXPORT LTDBBody(LTDBKopf* k);
+        DLLEXPORT LTDBBody(LTDBHeader* k);
         //! Destructor
         DLLEXPORT ~LTDBBody();
         //! Sets information about the size of the image. Required for loading.
         //! \param k The LTDB header of the image
-        DLLEXPORT void init(LTDBKopf k);
+        DLLEXPORT void init(LTDBHeader k);
         //! Sets information about the size of the image. Required for loading.
         //! \param k The LTDB header of the image
-        DLLEXPORT void init(LTDBKopf* k);
+        DLLEXPORT void init(LTDBHeader* k);
         //! Loads the pixel data from the file
         //! \param zF A progress bar that can be 0
         //! \param inF The opened ifstream of the LTDB file pointing to the
         //! correct position
-        DLLEXPORT void laden(FBalken* zF, std::ifstream* inF);
+        DLLEXPORT void laden(ProgressBar* zF, std::ifstream* inF);
         //! Sets the image to be saved
         //! \param b The image to save
         DLLEXPORT void setImage(Image* b);
@@ -253,7 +253,7 @@ namespace Framework
         //! \param zF A progress bar that can be 0
         //! \param outF The opened ofstream of the LTDB file pointing to the
         //! correct position
-        DLLEXPORT void speichern(FBalken* zF, std::ofstream* outF) const;
+        DLLEXPORT void speichern(ProgressBar* zF, std::ofstream* outF) const;
         //! Returns the loaded image
         DLLEXPORT Image* getImage() const;
         //! Returns the size of the image
@@ -261,44 +261,44 @@ namespace Framework
     };
 
     //! Manages an LTDB file
-    class LTDBDatei : public virtual ReferenceCounter
+    class LTDBFile : public virtual ReferenceCounter
     {
     private:
         Text* pfad;
-        LTDBDateiKopf* datKpf;
+        LTDBFileHeader* datKpf;
 
     public:
         //! Constructor
-        DLLEXPORT LTDBDatei();
+        DLLEXPORT LTDBFile();
         //! Destructor
-        DLLEXPORT ~LTDBDatei();
+        DLLEXPORT ~LTDBFile();
         //! Sets the path to the file
         //! \param pfad The path
-        DLLEXPORT void setDatei(Text* pfad);
+        DLLEXPORT void setFile(Text* pfad);
         //! Creates a new LTDB file
         DLLEXPORT void erstellen();
         //! Reads basic information from the file.
         //! Must be called before working with the file
         //! \param zF A progress bar that can be 0
-        DLLEXPORT void leseDaten(FBalken* zF);
+        DLLEXPORT void leseDaten(ProgressBar* zF);
         //! Deletes the LTDB file
         DLLEXPORT void remove();
         //! Deletes an image from the LTDB file
         //! \param zF A progress bar that can be 0
         //! \param name The name of the image to delete
-        DLLEXPORT void remove(FBalken* zF, Text* name);
+        DLLEXPORT void remove(ProgressBar* zF, Text* name);
         //! Loads an image from the LTDB file
         //! \param zF A progress bar that can be 0
         //! \param name The name of the image to load
         //! \return The loaded image. 0 if the image was not found
-        DLLEXPORT Image* laden(FBalken* zF, Text* name);
+        DLLEXPORT Image* laden(ProgressBar* zF, Text* name);
         //! Saves a new image in the LTDB file
         //! \param zF A progress bar that can be 0
         //! \param bild The image to save
         //! \param name The name under which the image should be saved
         //! \return Number of warnings that occurred while converting the name
         //! to a valid name. -1 if an image with the same name already exists
-        DLLEXPORT int speichern(FBalken* zF, Image* bild, Text* name);
+        DLLEXPORT int speichern(ProgressBar* zF, Image* bild, Text* name);
         //! Returns a list of stored images.
         //! The list should not be modified
         DLLEXPORT RCArray<Text>* zImageListe();
@@ -365,7 +365,7 @@ namespace Framework
 
     //! Manages the header of an LTDS file. Contains information about the
     //! font sizes stored in the file
-    class LTDSDateiKopf : public virtual ReferenceCounter
+    class LTDSFileHeader : public virtual ReferenceCounter
     {
     private:
         unsigned char sganzahl;
@@ -374,9 +374,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT LTDSDateiKopf();
+        DLLEXPORT LTDSFileHeader();
         //! Destructor
-        DLLEXPORT ~LTDSDateiKopf();
+        DLLEXPORT ~LTDSFileHeader();
         //! Loads the header from the LTDS file
         //! \param inF The opened ifstream of the LTDS file pointing to the
         //! correct position
@@ -403,7 +403,7 @@ namespace Framework
 
     //! The header of a font size. Contains information about the
     //! stored characters
-    class LTDSSchriftKopf : public virtual ReferenceCounter
+    class LTDSFontHeader : public virtual ReferenceCounter
     {
     private:
         unsigned char schriftSize;
@@ -413,9 +413,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT LTDSSchriftKopf();
+        DLLEXPORT LTDSFontHeader();
         //! Destructor
-        DLLEXPORT ~LTDSSchriftKopf();
+        DLLEXPORT ~LTDSFontHeader();
         //! Loads the header of a font size from the file
         //! \param inF The opened ifstream of the LTDS file pointing to the
         //! correct position
@@ -450,7 +450,7 @@ namespace Framework
 
     //! The header of a single character from the LTDS file. Contains
     //! information about the pixel size of the character
-    class LTDSBuchstabenKopf : public virtual ReferenceCounter
+    class LTDSCharacterHeader : public virtual ReferenceCounter
     {
     private:
         unsigned char zeichen;
@@ -458,7 +458,7 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT LTDSBuchstabenKopf();
+        DLLEXPORT LTDSCharacterHeader();
         //! Loads the data from the LTDS file
         //! \param inF The opened ifstream of the LTDS file pointing to the
         //! correct position
@@ -487,22 +487,22 @@ namespace Framework
     };
 
     //! Manages the pixel data of a character
-    class LTDSBuchstabenKoerper : public virtual ReferenceCounter
+    class LTDSCharacterBody : public virtual ReferenceCounter
     {
     private:
         Punkt size;
         unsigned char zeichen;
-        Buchstabe* buchstabe;
+        Character* buchstabe;
 
     public:
         //! Constructor
         //! \param kopf The header of the character
-        DLLEXPORT LTDSBuchstabenKoerper(LTDSBuchstabenKopf * kopf);
+        DLLEXPORT LTDSCharacterBody(LTDSCharacterHeader * kopf);
         //! Destructor
-        DLLEXPORT ~LTDSBuchstabenKoerper();
+        DLLEXPORT ~LTDSCharacterBody();
         //! Sets the character to be saved
         //! \param zeichen The character to save
-        DLLEXPORT void setBuchstabe(Buchstabe * zeichen);
+        DLLEXPORT void setCharacter(Character * zeichen);
         //! Loads the pixels from the LTDS file
         //! \param inF The opened ifstream of the LTDS file pointing to the
         //! correct position
@@ -512,23 +512,23 @@ namespace Framework
         //! correct position
         DLLEXPORT void speichern(std::ofstream * outF) const;
         //! Returns the loaded character
-        DLLEXPORT Buchstabe* getBuchstabe() const;
+        DLLEXPORT Character* getCharacter() const;
         //! Returns the ASCII code of the character
         DLLEXPORT unsigned char getZeichen() const;
     };
 
     //! Manages an LTDS file
-    class LTDSDatei : public virtual ReferenceCounter
+    class LTDSFile : public virtual ReferenceCounter
     {
     private:
         Text* pfad;
-        LTDSDateiKopf* dateiKopf;
+        LTDSFileHeader* dateiKopf;
 
     public:
         //! Constructor
-        DLLEXPORT LTDSDatei();
+        DLLEXPORT LTDSFile();
         //! Destructor
-        DLLEXPORT ~LTDSDatei();
+        DLLEXPORT ~LTDSFile();
         //! Sets the path to the file
         //! \param txt The path
         DLLEXPORT void setPfad(Text* txt);
@@ -544,7 +544,7 @@ namespace Framework
         //! \param zeich The character to save
         //! \param zeichen The ASCII code of the character
         DLLEXPORT void addBuchstabe(
-            int gr, Buchstabe* zeich, unsigned char zeichen);
+            int gr, Character* zeich, unsigned char zeichen);
         //! Deletes a specific font size from the file
         //! \param gr The font size to remove
         DLLEXPORT void loescheSchrifrGroesse(int gr);
@@ -553,9 +553,9 @@ namespace Framework
         //! \param zeichen The ASCII code of the character to delete
         DLLEXPORT void loescheBuchstabe(int gr, unsigned char zeichen);
         //! Deletes the LTDS file
-        DLLEXPORT void loescheDatei();
+        DLLEXPORT void deleteFile();
         //! Creates the LTDS file
-        DLLEXPORT void erstelleDatei();
+        DLLEXPORT void createFile();
         //! Saves an entire font to the file
         //! \param schrift The font to save
         DLLEXPORT void saveFont(Font* schrift);
@@ -571,7 +571,7 @@ namespace Framework
         //! \param schriftgroesse The font size the character belongs to
         //! \param zeichen The ASCII code of the character to load
         //! \return The loaded character. 0 if the character was not found.
-        DLLEXPORT Buchstabe* ladeBuchstabe(
+        DLLEXPORT Character* loadCharacter(
             int schriftgroesse, unsigned char zeichen);
         //! Returns the path to the LTDS file
         DLLEXPORT Text* getPfad() const;

Font.cpp

@@ -11,9 +11,9 @@
 
 using namespace Framework;
 
-// Contents of the Buchstabe class from Font.h
+// Contents of the Character class from Font.h
 // Constructor
-Buchstabe::Buchstabe()
+Character::Character()
     : ReferenceCounter(),
       size(0, 0),
       alpha(0),
@@ -21,13 +21,13 @@ Buchstabe::Buchstabe()
 {}
 
 // Destructor
-Buchstabe::~Buchstabe()
+Character::~Character()
 {
     if (alpha) delete[] alpha;
 }
 
 // non-constant
-void Buchstabe::NeuBuchstabe(Punkt& size) // Initialization
+void Character::NewCharacter(Punkt& size) // Initialization
 {
     this->size = size;
     if (alpha) delete[] alpha;
@@ -35,49 +35,49 @@ void Buchstabe::NeuBuchstabe(Punkt& size) // Initialization
     ZeroMemory(alpha, size.x * size.y);
 }
 
-void Buchstabe::setPixel(
+void Character::setPixel(
     Punkt& pos, unsigned char alpha) // sets the alpha value of the pixel
 {
     this->alpha[pos.x + pos.y * size.x] = alpha;
 }
 
-void Buchstabe::setPixel(int x, int y, unsigned char alpha)
+void Character::setPixel(int x, int y, unsigned char alpha)
 {
     this->alpha[x + y * size.x] = alpha;
 }
 
-void Buchstabe::setPixel(int i, unsigned char alpha)
+void Character::setPixel(int i, unsigned char alpha)
 {
     this->alpha[i] = alpha;
 }
 
-void Buchstabe::setSchriftSize(int sg) // sets the font size of the character
+void Character::setSchriftSize(int sg) // sets the font size of the character
 {
     schriftSize = sg;
 }
 
-int Buchstabe::getSchriftSize() const
+int Character::getSchriftSize() const
 {
     return schriftSize;
 }
 
 // constant
-const Punkt& Buchstabe::getSize() const // returns the character image size
+const Punkt& Character::getSize() const // returns the character image size
 {
     return size;
 }
 
-int Buchstabe::getBreite() const // character width
+int Character::getBreite() const // character width
 {
     return size.x;
 }
 
-int Buchstabe::getHeight() const // character height
+int Character::getHeight() const // character height
 {
     return size.y;
 }
 
-unsigned char* Buchstabe::getBuff() const // returns the alpha buffer
+unsigned char* Character::getBuff() const // returns the alpha buffer
 {
     return alpha;
 }
@@ -86,7 +86,7 @@ unsigned char* Buchstabe::getBuff() const // returns the alpha buffer
 // Constructor
 Alphabet::Alphabet()
     : ReferenceCounter(),
-      zeichen(new Buchstabe*[256]),
+      zeichen(new Character*[256]),
       schriftSize(12)
 {
     for (int i = 0; i < 256; ++i)
@@ -114,8 +114,8 @@ void Alphabet::NeuAlphabet() // Initialization
         zeichen[i] = 0;
 }
 
-void Alphabet::setBuchstabe(
-    unsigned char i, Buchstabe* buchstabe) // sets a character
+void Alphabet::setCharacter(
+    unsigned char i, Character* buchstabe) // sets a character
 {
     if (zeichen[i]) zeichen[i]->release();
     zeichen[i] = buchstabe;
@@ -135,14 +135,14 @@ void Alphabet::setSchriftSize(int gr) // sets the font size
 }
 
 // constant
-Buchstabe* Alphabet::getBuchstabe(
+Character* Alphabet::getCharacter(
     unsigned char i) const // returns a character
 {
-    if (zeichen[i]) return dynamic_cast<Buchstabe*>(zeichen[i]->getThis());
+    if (zeichen[i]) return dynamic_cast<Character*>(zeichen[i]->getThis());
     return 0;
 }
 
-Buchstabe* Alphabet::zBuchstabe(unsigned char i) const
+Character* Alphabet::zCharacter(unsigned char i) const
 {
     return zeichen[i];
 }
@@ -314,7 +314,7 @@ void TextRenderer::setFontZ(Font* schrift)
             Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
             for (int i = 0; i < 256; i++)
             {
-                Buchstabe* b = a->zBuchstabe((unsigned char)i);
+                Character* b = a->zCharacter((unsigned char)i);
                 if (b)
                 {
                     charWidths[i]
@@ -366,7 +366,7 @@ void TextRenderer::setSchriftSize(int sg)
             Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
             for (int i = 0; i < 256; i++)
             {
-                Buchstabe* b = a->zBuchstabe((unsigned char)i);
+                Character* b = a->zCharacter((unsigned char)i);
                 if (b)
                 {
                     charWidths[i]
@@ -569,7 +569,7 @@ void TextRenderer::renderChar(int& x,
     if (!s) return;
     Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
     if (!a) return;
-    Buchstabe* b = a->zBuchstabe(c);
+    Character* b = a->zCharacter(c);
     if (b)
     {
         if (x >= zRObj.getBreite()) return;
@@ -804,15 +804,15 @@ int TextRenderer::textPos(const char* txt, int mausX, int mausY) const
     return -1;
 }
 
-GravurTextRenderer::GravurTextRenderer()
-    : GravurTextRenderer(0)
+EngravedTextRenderer::EngravedTextRenderer()
+    : EngravedTextRenderer(0)
 {}
 
-GravurTextRenderer::GravurTextRenderer(Font* schrift)
+EngravedTextRenderer::EngravedTextRenderer(Font* schrift)
     : TextRenderer(schrift)
 {}
 
-GravurTextRenderer::~GravurTextRenderer() {}
+EngravedTextRenderer::~EngravedTextRenderer() {}
 
 // Draws a specific character with coloring onto an image
 // Use (setPosition) and (setDrawSchriftGroesse) to change position and size
@@ -824,7 +824,7 @@ GravurTextRenderer::~GravurTextRenderer() {}
 //  underlined: 1 if the text should be underlined
 //  selected: 1 if the character should be colored
 //  selectedBackgroundColor: The background color of the colored text
-void GravurTextRenderer::renderChar(int& x,
+void EngravedTextRenderer::renderChar(int& x,
     int y,
     char c,
     Image& zRObj,
@@ -835,7 +835,7 @@ void GravurTextRenderer::renderChar(int& x,
 {
     if (!s) return;
     Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
-    Buchstabe* b = a->zBuchstabe(c);
+    Character* b = a->zCharacter(c);
     if (b)
     {
         if (x >= zRObj.getBreite()) return;
@@ -980,7 +980,7 @@ void GravurTextRenderer::renderChar(int& x,
 
 // Determines how many pixels are needed to fully display a specific character
 //  c: The character whose width in pixels should be determined
-int GravurTextRenderer::getCharWidth(const char c) const
+int EngravedTextRenderer::getCharWidth(const char c) const
 {
     if (c == '\t')
         return schriftSize;
@@ -992,20 +992,20 @@ int GravurTextRenderer::getCharWidth(const char c) const
 
 // Determines how many pixels are needed to fully display a specific character
 //  c: The character whose height in pixels should be determined
-int GravurTextRenderer::getCharHeight(const char c) const
+int EngravedTextRenderer::getCharHeight(const char c) const
 {
     return TextRenderer::getCharHeight(c) * 2;
 }
 
-KursivTextRenderer::KursivTextRenderer()
-    : KursivTextRenderer(0)
+ItalicTextRenderer::ItalicTextRenderer()
+    : ItalicTextRenderer(0)
 {}
 
-KursivTextRenderer::KursivTextRenderer(Font* schrift)
+ItalicTextRenderer::ItalicTextRenderer(Font* schrift)
     : TextRenderer(schrift)
 {}
 
-KursivTextRenderer::~KursivTextRenderer() {}
+ItalicTextRenderer::~ItalicTextRenderer() {}
 
 // Draws a specific character with coloring onto an image
 // Use (setPosition) and (setDrawSchriftGroesse) to change position and size
@@ -1017,7 +1017,7 @@ KursivTextRenderer::~KursivTextRenderer() {}
 //  underlined: 1 if the text should be underlined
 //  selected: 1 if the character should be colored
 //  selectedBackgroundColor: The background color of the colored text
-void KursivTextRenderer::renderChar(int& x,
+void ItalicTextRenderer::renderChar(int& x,
     int y,
     char c,
     Image& zRObj,
@@ -1029,7 +1029,7 @@ void KursivTextRenderer::renderChar(int& x,
     if (!s) return;
     Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
     if (!a) return;
-    Buchstabe* b = a->zBuchstabe(c);
+    Character* b = a->zCharacter(c);
     if (b)
     {
         if (x >= zRObj.getBreite()) return;
@@ -1155,7 +1155,7 @@ void KursivTextRenderer::renderChar(int& x,
 
 // Determines how many pixels are needed to fully display a specific character
 //  c: The character whose width in pixels should be determined
-int KursivTextRenderer::getCharWidth(const char c) const
+int ItalicTextRenderer::getCharWidth(const char c) const
 {
     if (c == '\t')
         return schriftSize;

Font.h

@@ -11,14 +11,14 @@ namespace Framework
 {
     class Image;      //! Image.h
     class Text;      //! Text.h
-    class Buchstabe; //! from this file
+    class Character; //! from this file
     class Alphabet;  //! from this file
     class Font;   //! from this file
 
     //! Stores the alpha values of a character of a specific font.
     //! The other color values are determined by the font color. Hence only
     //! the alpha values.
-    class Buchstabe : public virtual ReferenceCounter
+    class Character : public virtual ReferenceCounter
     {
     private:
         Punkt size;
@@ -27,12 +27,12 @@ namespace Framework
 
     public:
         //! Creates a new empty object
-        DLLEXPORT Buchstabe();
+        DLLEXPORT Character();
         //! Deletes the object
-        DLLEXPORT ~Buchstabe();
+        DLLEXPORT ~Character();
         //! Creates a new character with a specific size
         //! \param size The size of the character in pixels
-        DLLEXPORT void NeuBuchstabe(Punkt& size);
+        DLLEXPORT void NewCharacter(Punkt& size);
         //! Sets the alpha value of a specific pixel
         //! \param pos The position of the pixel
         //! \param alpha The value of the pixel
@@ -68,7 +68,7 @@ namespace Framework
     class Alphabet : public virtual ReferenceCounter
     {
     private:
-        Buchstabe** zeichen;
+        Character** zeichen;
         int schriftSize;
 
     public:
@@ -82,18 +82,18 @@ namespace Framework
         //! If the added character already exists, it will be overwritten
         //! \param i The ASCII code of the character to add
         //! \param buchstabe The character to add
-        DLLEXPORT void setBuchstabe(unsigned char i, Buchstabe* buchstabe);
+        DLLEXPORT void setCharacter(unsigned char i, Character* buchstabe);
         //! Sets the font size of the alphabet and its stored characters
         //! \param gr The font size of the alphabet
         DLLEXPORT void setSchriftSize(int gr);
         //! Returns the stored character for a specific ASCII code
         //! \param i The ASCII code of the character \return A pointer to
         //! the character with increased reference counter
-        DLLEXPORT Buchstabe* getBuchstabe(unsigned char i) const;
+        DLLEXPORT Character* getCharacter(unsigned char i) const;
         //! Returns the stored character for a specific ASCII code
         //! \param i The ASCII code of the character \return A pointer to
         //! the character without increased reference counter
-        DLLEXPORT Buchstabe* zBuchstabe(unsigned char i) const;
+        DLLEXPORT Character* zCharacter(unsigned char i) const;
         //! Checks whether a character exists for a specific ASCII code
         //! \param b The ASCII code to check
         //! \return (true) if a character was found for the code. (false)
@@ -291,12 +291,12 @@ namespace Framework
             const char* txt, int mausX, int mausY) const;
     };
 
-    class GravurTextRenderer : public TextRenderer
+    class EngravedTextRenderer : public TextRenderer
     {
     public:
-        DLLEXPORT GravurTextRenderer();
-        DLLEXPORT GravurTextRenderer(Font* schrift);
-        DLLEXPORT virtual ~GravurTextRenderer();
+        DLLEXPORT EngravedTextRenderer();
+        DLLEXPORT EngravedTextRenderer(Font* schrift);
+        DLLEXPORT virtual ~EngravedTextRenderer();
         //! Draws a specific character with coloring onto an image.
         //! Use (setPosition) and (setDrawSchriftGroesse) to change position
         //! and size \param x x position of the first character
@@ -326,12 +326,12 @@ namespace Framework
         DLLEXPORT virtual int getCharHeight(const char c) const override;
     };
 
-    class KursivTextRenderer : public TextRenderer
+    class ItalicTextRenderer : public TextRenderer
     {
     public:
-        DLLEXPORT KursivTextRenderer();
-        DLLEXPORT KursivTextRenderer(Font* schrift);
-        DLLEXPORT virtual ~KursivTextRenderer();
+        DLLEXPORT ItalicTextRenderer();
+        DLLEXPORT ItalicTextRenderer(Font* schrift);
+        DLLEXPORT virtual ~ItalicTextRenderer();
         //! Draws a specific character with coloring onto an image.
         //! Use (setPosition) and (setDrawSchriftGroesse) to change position
         //! and size \param x x position of the first character

Framework Tests/Array.cpp

@@ -14,8 +14,8 @@ namespace FrameworkTests
         TEST_METHOD (EmtptyTest)
         {
             Framework::Array<int> array;
-            Assert::IsTrue(array.getEintragAnzahl() == 0,
-                L"getEintragAnzahl() on empty array should be 0");
+            Assert::IsTrue(array.getEntryCount() == 0,
+                L"getEntryCount() on empty array should be 0");
             int count = 0;
             for (auto i : array)
                 count++;
@@ -35,8 +35,8 @@ namespace FrameworkTests
             array.add(20, 1);
             array.add(10, 0);
             array.add(0);
-            Assert::IsTrue(array.getEintragAnzahl() == 4,
-                L"after adding 4 elements getEintragAnzahl() should be 4");
+            Assert::IsTrue(array.getEntryCount() == 4,
+                L"after adding 4 elements getEntryCount() should be 4");
             Assert::IsTrue(array.get(0) == 10,
                 L"invalid value at index 0 of array after adding elements");
             Assert::IsTrue(array.get(1) == 100,
@@ -75,9 +75,9 @@ namespace FrameworkTests
             array.remove(3);
             array.remove(1);
             array.remove(0);
-            Assert::IsTrue(array.getEintragAnzahl() == 1,
+            Assert::IsTrue(array.getEntryCount() == 1,
                 L"after adding 4 elements and removing 3 elements "
-                L"getEintragAnzahl() should be 1");
+                L"getEntryCount() should be 1");
             Assert::IsTrue(array.get(0) == 20,
                 L"invalid value at index 0 of array after removing elements");
             Assert::IsTrue(array.begin().val() == 20,
@@ -98,8 +98,8 @@ namespace FrameworkTests
             array.add(0);
             array.tausch(0, 3);
             array.tausch(1, 2);
-            Assert::IsTrue(array.getEintragAnzahl() == 4,
-                L"after adding 4 elements and swap elements getEintragAnzahl() "
+            Assert::IsTrue(array.getEntryCount() == 4,
+                L"after adding 4 elements and swap elements getEntryCount() "
                 L"should be 4");
             Assert::IsTrue(array.get(0) == 0,
                 L"invalid value at index 0 of array after swapping elements");
@@ -126,9 +126,9 @@ namespace FrameworkTests
             array.set(30, 0);
             array.set(200, 3);
             array.set(500, 1);
-            Assert::IsTrue(array.getEintragAnzahl() == 4,
+            Assert::IsTrue(array.getEntryCount() == 4,
                 L"after adding 4 elements and changing elements "
-                L"getEintragAnzahl() should be 4");
+                L"getEntryCount() should be 4");
             Assert::IsTrue(array.get(0) == 30,
                 L"invalid value at index 0 of array after swapping elements");
             Assert::IsTrue(array.get(1) == 500,
@@ -147,9 +147,9 @@ namespace FrameworkTests
             array.add(10, 0);
             array.add(0);
             array.removeValue(10);
-            Assert::IsTrue(array.getEintragAnzahl() == 3,
+            Assert::IsTrue(array.getEntryCount() == 3,
                 L"after adding 4 elements and removing elements by value "
-                L"getEintragAnzahl() should be 3");
+                L"getEntryCount() should be 3");
             Assert::IsTrue(array.getWertIndex(0) == 2,
                 L"invalid value index of value after removing elements");
             Assert::IsTrue(array.getWertIndex(10) < 0,
@@ -197,8 +197,8 @@ namespace FrameworkTests
         TEST_METHOD (EmtptyTest)
         {
             Framework::RCArray<Test<RCArrayTests>> array;
-            Assert::IsTrue(array.getEintragAnzahl() == 0,
-                L"getEintragAnzahl() on empty array should be 0");
+            Assert::IsTrue(array.getEntryCount() == 0,
+                L"getEntryCount() on empty array should be 0");
             int count = 0;
             for (auto i : array)
                 count++;
@@ -218,8 +218,8 @@ namespace FrameworkTests
             array.add(new Test<RCArrayTests>(20, this), 1);
             array.add(new Test<RCArrayTests>(10, this), 0);
             array.add(new Test<RCArrayTests>(0, this));
-            Assert::IsTrue(array.getEintragAnzahl() == 4,
-                L"after adding 4 elements getEintragAnzahl() should be 4");
+            Assert::IsTrue(array.getEntryCount() == 4,
+                L"after adding 4 elements getEntryCount() should be 4");
             Assert::IsTrue((int)*array.z(0) == 10,
                 L"invalid value at index 0 of array after adding elements");
             Assert::IsTrue((int)*array.z(1) == 100,
@@ -260,9 +260,9 @@ namespace FrameworkTests
             array.remove(3);
             array.remove(1);
             array.remove(0);
-            Assert::IsTrue(array.getEintragAnzahl() == 1,
+            Assert::IsTrue(array.getEntryCount() == 1,
                 L"after adding 4 elements and removing 3 elements "
-                L"getEintragAnzahl() should be 1");
+                L"getEntryCount() should be 1");
             Assert::IsTrue((int)*array.z(0) == 20,
                 L"invalid value at index 0 of array after removing elements");
             Assert::IsTrue(array.begin()->getVal() == 20,
@@ -286,8 +286,8 @@ namespace FrameworkTests
             array.add(new Test<RCArrayTests>(0, this));
             array.tausch(0, 3);
             array.tausch(1, 2);
-            Assert::IsTrue(array.getEintragAnzahl() == 4,
-                L"after adding 4 elements and swap elements getEintragAnzahl() "
+            Assert::IsTrue(array.getEntryCount() == 4,
+                L"after adding 4 elements and swap elements getEntryCount() "
                 L"should be 4");
             Assert::IsTrue((int)*array.z(0) == 0,
                 L"invalid value at index 0 of array after swapping elements");
@@ -302,7 +302,7 @@ namespace FrameworkTests
                 L"invalid value at index 2 of array after swapping elements");
             Assert::IsTrue((int)*array.z(0) == 100,
                 L"invalid value at index 0 of array after swapping elements");
-            Assert::IsTrue(array.getEintragAnzahl() == 4,
+            Assert::IsTrue(array.getEntryCount() == 4,
                 L"invalid value count in array after swapping elements");
             array.leeren();
             Assert::IsTrue(deleteCounter == 4, L"Memory leaks detected");
@@ -318,9 +318,9 @@ namespace FrameworkTests
             array.set(new Test<RCArrayTests>(30, this), 0);
             array.set(new Test<RCArrayTests>(200, this), 3);
             array.set(new Test<RCArrayTests>(500, this), 1);
-            Assert::IsTrue(array.getEintragAnzahl() == 4,
+            Assert::IsTrue(array.getEntryCount() == 4,
                 L"after adding 4 elements and changing elements "
-                L"getEintragAnzahl() should be 4");
+                L"getEntryCount() should be 4");
             Assert::IsTrue((int)*array.z(0) == 30,
                 L"invalid value at index 0 of array after swapping elements");
             Assert::IsTrue((int)*array.z(1) == 500,
@@ -339,9 +339,9 @@ namespace FrameworkTests
             Framework::RCArray<Test<RCArrayTests>> array;
             array.add(new Test<RCArrayTests>(100, this));
             array.begin().remove();
-            Assert::IsTrue(array.getEintragAnzahl() == 0,
+            Assert::IsTrue(array.getEntryCount() == 0,
                 L"after adding 1 element and removing it "
-                L"getEintragAnzahl() should be 0");
+                L"getEntryCount() should be 0");
             array.add(new Test<RCArrayTests>(100, this));
             array.add(new Test<RCArrayTests>(20, this), 1);
             array.add(new Test<RCArrayTests>(10, this), 0);
@@ -365,9 +365,9 @@ namespace FrameworkTests
             while (i)
             {
                 i.remove();
-                Assert::IsTrue(array.getEintragAnzahl() == --count,
+                Assert::IsTrue(array.getEntryCount() == --count,
                     L"after removing 1 element "
-                    L"getEintragAnzahl() should be reduced");
+                    L"getEntryCount() should be reduced");
             }
             Assert::IsTrue(deleteCounter == 5, L"Memory leaks detected");
         }
@@ -379,9 +379,9 @@ namespace FrameworkTests
             array.add(new Test<RCArrayTests>(20, this));
             array.setPosition(0, 1);
             array.add(new Test<RCArrayTests>(10, this));
-            Assert::IsTrue(array.getEintragAnzahl() == 3,
+            Assert::IsTrue(array.getEntryCount() == 3,
                 L"after adding 3 elements "
-                L"getEintragAnzahl() should be 0");
+                L"getEntryCount() should be 0");
             Assert::IsTrue(array.z(2)->getVal() == 10,
                 L"third element of array has an invalid value");
         }

Framework Tests/Json.cpp

@@ -335,7 +335,7 @@ namespace FrameworkTests
                 = jArray->toArray<int>([](Framework::JSON::JSONValue& v) {
                       return (int)v.asNumber()->getNumber();
                   });
-            Assert::IsTrue(numberArray->getEintragAnzahl() == 10,
+            Assert::IsTrue(numberArray->getEntryCount() == 10,
                 L"Array hat die falsche Anzahl an elementen");
             Assert::IsTrue(numberArray->get(2) == 3,
                 L"Array hat mindestens ein falsches element");
@@ -367,7 +367,7 @@ namespace FrameworkTests
                     [](Framework::JSON::JSONValue& v) {
                         return new Framework::Text(v.asString()->getString());
                     });
-            Assert::IsTrue(numberArray->getEintragAnzahl() == 5,
+            Assert::IsTrue(numberArray->getEntryCount() == 5,
                 L"Array hat die falsche Anzahl an elementen");
             Assert::IsTrue(numberArray->z(1)->istGleich("2"),
                 L"Array hat mindestens ein falsches element");
@@ -415,9 +415,9 @@ namespace FrameworkTests
                     }
                 });
             Assert::IsTrue(
-                obj->name.istGleich("test"), L"Feld hat falschen wert");
+                obj->name.istGleich("test"), L"Field hat falschen wert");
             Assert::IsTrue(
-                obj->value.istGleich("1234"), L"Feld hat falschen wert");
+                obj->value.istGleich("1234"), L"Field hat falschen wert");
             delete obj;
             jObj->release();
         }
@@ -434,7 +434,7 @@ namespace FrameworkTests
                 = Framework::JSON::JSONArray::fromArray<int>(arr,
                     [](int v) { return new Framework::JSON::JSONNumber(v); });
             Assert::IsTrue(
-                jArray->getLength() == 4, L"Array hat falsche länge");
+                jArray->getLength() == 4, L"Array hat falsche l�nge");
             Framework::JSON::JSONNumber* n = jArray->getValue(1)->asNumber();
             Assert::IsTrue(n->getNumber() == 2,
                 L"Array hat mindestens einen falschen Wert");
@@ -452,7 +452,7 @@ namespace FrameworkTests
                     return new Framework::JSON::JSONString(v);
                 });
             Assert::IsTrue(
-                jArray->getLength() == 4, L"Array hat falsche länge");
+                jArray->getLength() == 4, L"Array hat falsche l�nge");
             Framework::JSON::JSONString* s = jArray->getValue(2)->asString();
             Assert::IsTrue(s->getString().istGleich("3"),
                 L"Array hat mindestens einen falschen Wert");
@@ -658,7 +658,7 @@ namespace FrameworkTests
                 invalidParts;
             Framework::JSON::JSONValue* validValue
                 = result->getValidPart(&invalidParts);
-            Assert::IsTrue(invalidParts.getEintragAnzahl() > 0,
+            Assert::IsTrue(invalidParts.getEntryCount() > 0,
                 L"No Invalid parts were returned for an invalid Json");
             for (Framework::Validator::ValidationResult* invalid : invalidParts)
             {
@@ -787,7 +787,7 @@ namespace FrameworkTests
             Framework::RCArray<Framework::Validator::ValidationResult>
                 invalidParts;
             value = result->getValidPart(&invalidParts);
-            Assert::IsTrue(invalidParts.getEintragAnzahl() == 0,
+            Assert::IsTrue(invalidParts.getEntryCount() == 0,
                 L"Invalid parts were returned for a valid validation result");
             Assert::IsTrue(JSONParserTests::isEqual(validValue, value),
                 L"getValidPart of a valid validation result should return the "
@@ -928,7 +928,7 @@ namespace FrameworkTests
                 invalidParts;
             Framework::JSON::JSONValue* validValue
                 = result->getValidPart(&invalidParts);
-            Assert::IsTrue(invalidParts.getEintragAnzahl() > 0,
+            Assert::IsTrue(invalidParts.getEntryCount() > 0,
                 L"No Invalid parts were returned for an invalid Json");
             for (Framework::Validator::ValidationResult* invalid : invalidParts)
             {

Framework Tests/Regex.cpp

@@ -14,7 +14,7 @@ namespace FrameworkTests
         {
             auto parser = Framework::Regex::parse("ab+(c{3,6})?|b(a)");
             auto result = parser->match("abccccab", (int)strlen("abccccab"));
-            Assert::IsTrue(result->getEintragAnzahl() == 2,
+            Assert::IsTrue(result->getEntryCount() == 2,
                 L"Invalid result count while matching 'abccccab' against "
                 L"'ab+(c{3,6})?|b(a)'");
             auto* first = result->z(0);
@@ -47,7 +47,7 @@ namespace FrameworkTests
             auto parser = Framework::Regex::parse("abc");
             auto result
                 = parser->match(" aabc abcc", (int)strlen(" aabc abcc"));
-            Assert::IsTrue(result->getEintragAnzahl() == 2,
+            Assert::IsTrue(result->getEntryCount() == 2,
                 L"Invalid result count while matching ' aabc abcc' against "
                 L"'abc'");
             auto* first = result->z(0);
@@ -74,7 +74,7 @@ namespace FrameworkTests
         {
             auto parser = Framework::Regex::parse("(?:abc)*");
             auto result = parser->match("_aabcabcc", (int)strlen(" aabcabcc"));
-            Assert::IsTrue(result->getEintragAnzahl() == 5,
+            Assert::IsTrue(result->getEntryCount() == 5,
                 L"Invalid result count while matching '_aabcabcc' against "
                 L"'(?:abc)*'");
             auto* first = result->z(0);
@@ -125,7 +125,7 @@ namespace FrameworkTests
         {
             auto parser = Framework::Regex::parse("(?:abc)*?");
             auto result = parser->match("_aabcabcc", (int)strlen(" aabcabcc"));
-            Assert::IsTrue(result->getEintragAnzahl() == 8,
+            Assert::IsTrue(result->getEntryCount() == 8,
                 L"Invalid result count while matching '_aabcabcc' against "
                 L"'(?:abc)*?'");
             auto* _0 = result->z(0);
@@ -201,7 +201,7 @@ namespace FrameworkTests
             auto parser = Framework::Regex::parse("(a|b)+");
             auto result
                 = parser->match("cabaccccbab", (int)strlen("cabaccccbab"));
-            Assert::IsTrue(result->getEintragAnzahl() == 2,
+            Assert::IsTrue(result->getEntryCount() == 2,
                 L"Invalid result count while matching 'cabaccccbab' against "
                 L"'a|b'");
             auto* first = result->z(0);
@@ -238,7 +238,7 @@ namespace FrameworkTests
         {
             auto parser = Framework::Regex::parse("(?:^|c)ab");
             auto result = parser->match("abcabcasd", (int)strlen("abcabcasd"));
-            Assert::IsTrue(result->getEintragAnzahl() == 2,
+            Assert::IsTrue(result->getEntryCount() == 2,
                 L"Invalid result count while matching 'abcabcasd' against "
                 L"'(?:^|c)ab'");
             auto* first = result->z(0);
@@ -276,7 +276,7 @@ namespace FrameworkTests
             }
             auto parser = Framework::Regex::parse(regex);
             auto result = parser->match(str, str.getLength());
-            Assert::IsTrue(result->getEintragAnzahl() == 1,
+            Assert::IsTrue(result->getEntryCount() == 1,
                 L"Invalid result count while matching 'a^20' against "
                 L"a?^20a^20");
             auto* first = result->z(0);
@@ -291,7 +291,7 @@ namespace FrameworkTests
         {
             auto parser = Framework::Regex::parse("^[0-9]+$");
             auto* results = parser->match("0", 1);
-            bool ok = results->getEintragAnzahl() == 1;
+            bool ok = results->getEntryCount() == 1;
             results->release();
             parser->release();
             Assert::IsTrue(
@@ -302,7 +302,7 @@ namespace FrameworkTests
         {
             auto parser = Framework::Regex::parse("^[0-9]+(\\.[0-9]+)?$");
             auto* results = parser->match("0", 1);
-            bool ok = results->getEintragAnzahl() == 1;
+            bool ok = results->getEntryCount() == 1;
             results->release();
             parser->release();
             Assert::IsTrue(ok,
@@ -315,7 +315,7 @@ namespace FrameworkTests
             auto parser = Framework::Regex::parse(
                 "^[0-9]+(\\.[0-9]+)?([eE][+-]?[0-9]+)?$");
             auto* results = parser->match("0", 1);
-            bool ok = results->getEintragAnzahl() == 1;
+            bool ok = results->getEntryCount() == 1;
             results->release();
             parser->release();
             Assert::IsTrue(ok,
@@ -328,7 +328,7 @@ namespace FrameworkTests
             auto parser = Framework::Regex::parse(
                 "^[0-9]+(\\.[0-9]+)?([eE][+-]?[0-9]+)?$");
             auto* results = parser->match("1e-3", 1);
-            bool ok = results->getEintragAnzahl() == 1;
+            bool ok = results->getEntryCount() == 1;
             results->release();
             parser->release();
             Assert::IsTrue(ok,

Framework Tests/Stream.cpp

@@ -49,7 +49,7 @@ namespace FrameworkTests
                               return curr;
                           },
                           new Framework::Array<int>());
-            Assert::AreEqual(5, result->getEintragAnzahl());
+            Assert::AreEqual(5, result->getEntryCount());
             Assert::AreEqual(2, result->get(0));
             Assert::AreEqual(4, result->get(1));
             Assert::AreEqual(8, result->get(2));
@@ -80,7 +80,7 @@ namespace FrameworkTests
                               return curr;
                           },
                           new Framework::Array<int>());
-            Assert::AreEqual(5, result->getEintragAnzahl());
+            Assert::AreEqual(5, result->getEntryCount());
             Assert::AreEqual(1, result->get(0));
             Assert::AreEqual(2, result->get(1));
             Assert::AreEqual(4, result->get(2));

Framework Tests/pch.h

@@ -1,8 +1,8 @@
 // pch.h: Dies ist eine vorkompilierte Headerdatei.
-// Die unten aufgeführten Dateien werden nur einmal kompiliert, um die Buildleistung für zukünftige Builds zu verbessern.
+// Die unten aufgeführten Files werden nur einmal kompiliert, um die Buildleistung für zukünftige Builds zu verbessern.
 // Dies wirkt sich auch auf die IntelliSense-Leistung aus, Codevervollständigung und viele Features zum Durchsuchen von Code eingeschlossen.
-// Die hier aufgeführten Dateien werden jedoch ALLE neu kompiliert, wenn mindestens eine davon zwischen den Builds aktualisiert wird.
-// Fügen Sie hier keine Dateien hinzu, die häufig aktualisiert werden sollen, da sich so der Leistungsvorteil ins Gegenteil verkehrt.
+// Die hier aufgeführten Files werden jedoch ALLE neu kompiliert, wenn mindestens eine davon zwischen den Builds aktualisiert wird.
+// Fügen Sie hier keine Files hinzu, die häufig aktualisiert werden sollen, da sich so der Leistungsvorteil ins Gegenteil verkehrt.
 
 #ifndef PCH_H
 #define PCH_H

Function.h

@@ -7,11 +7,11 @@
 
 namespace Framework
 {
-    class Funktion
+    class Function
     {
-        Typ typ;
+        Type typ;
         Sichtbarkeit sichtbarkeit;
         std::vector<std::pair<Text, Text>> annotations;
-        std::vector<Feld> parameter;
+        std::vector<Field> parameter;
     };
 }; // namespace Framework

Global.cpp

@@ -35,7 +35,7 @@ void Framework::initFramework(HINSTANCE__* hInst)
 #endif
     for (int i = 0; i < 3; ++i)
         MausStand[i] = 0;
-    TexturList::init();
+    TextureList::init();
     dlls = new DLLRegister();
     _hinst = hInst;
     istInitialisiert = 1;
@@ -48,7 +48,7 @@ void Framework::releaseFramework()
     if (!istInitialisiert) return;
     thRegister->cleanUpClosedThreads();
     dlls->release();
-    TexturList::destroy();
+    TextureList::destroy();
     delete thRegister;
     loggingHandler->release();
     istInitialisiert = 0;
@@ -110,9 +110,9 @@ void Framework::setDebugDX(bool debug)
 
 #ifdef WIN32
 // returns a reference to the mouse
-Framework::Maus& Framework::getMaus()
+Framework::Mouse& Framework::getMouse()
 {
-    return Framework::MausZeiger;
+    return Framework::mousePointer;
 }
 
 //! sets the mouse state to visible or invisible

Globals.h

@@ -19,8 +19,8 @@ namespace Framework
     class ThreadRegister; //! Thread.h
     class Thread;         //! Thread.h
     class Model3DList;    //! Model3DList.h
-    class TexturList;     //! TextureList.h
-    class Datei;          //! File.h
+    class TextureList;     //! TextureList.h
+    class File;          //! File.h
     class DLLRegister;    //! DLLRegister.h
 
     namespace Logging
@@ -29,12 +29,12 @@ namespace Framework
     }
 
 #ifdef WIN32
-    class Maus;          //! Mouse.h
+    class Mouse;          //! Mouse.h
     class NativeWindowArray; //! Window.h
 
     Global NativeWindowArray nativeWindows;
     Global bool MausTrack;
-    Global Maus MausZeiger;
+    Global Mouse mousePointer;
     Global bool msgExit;
 #endif
     Global bool MausStand[3];
@@ -82,7 +82,7 @@ namespace Framework
     DLLEXPORT void setDebugDX(bool debug);
 #ifdef WIN32
     //! Returns a reference to the mouse
-    DLLEXPORT Maus& getMaus();
+    DLLEXPORT Mouse& getMouse();
     //! Sets the mouse cursor visibility
     DLLEXPORT void setShowCursor(bool visible);
 #endif

GraphicsApi.cpp

@@ -53,11 +53,11 @@ void GraphicsApi::setFullScreen(bool fullScreen)
 
 void GraphicsApi::beginFrame(bool fill2D, bool fill3D, int fillColor) {}
 
-void GraphicsApi::renderKamera(Kam3D* zKamera) {}
+void GraphicsApi::renderKamera(Cam3D* zKamera) {}
 
-void GraphicsApi::renderKamera(Kam3D* zKamera, Textur* zTarget) {}
+void GraphicsApi::renderKamera(Cam3D* zKamera, Texture* zTarget) {}
 
-Textur* GraphicsApi::createOrGetTextur(const char* name, Image* b)
+Texture* GraphicsApi::createOrGetTexture(const char* name, Image* b)
 {
     if (b) b->release();
     return 0;

GraphicsApi.h

@@ -50,13 +50,13 @@ namespace Framework
 {
     class NativeWindow;
     class Image;
-    class Textur;
+    class Texture;
     class DX11PixelShader;
     class DX11VertexShader;
-    class TexturModel;
+    class TextureModel;
     class Render3D;
-    class TexturList;
-    class Kam3D;
+    class TextureList;
+    class Cam3D;
     class Model3D;
     class DX11Buffer;
     class DX11StructuredBuffer;
@@ -112,10 +112,10 @@ namespace Framework
         DLLEXPORT virtual void update() = 0;
         DLLEXPORT virtual void beginFrame(
             bool fill2D = 0, bool fill3D = 0, int fillColor = 0);
-        DLLEXPORT virtual void renderKamera(Kam3D* zKamera);
-        DLLEXPORT virtual void renderKamera(Kam3D* zKamera, Textur* zTarget);
+        DLLEXPORT virtual void renderKamera(Cam3D* zKamera);
+        DLLEXPORT virtual void renderKamera(Cam3D* zKamera, Texture* zTarget);
         DLLEXPORT virtual void presentFrame() = 0;
-        DLLEXPORT virtual Textur* createOrGetTextur(
+        DLLEXPORT virtual Texture* createOrGetTexture(
             const char* name, Image* b = 0);
         DLLEXPORT GraphicApiType getTyp() const;
         DLLEXPORT Vec2<int> getBackBufferSize() const;
@@ -157,9 +157,9 @@ namespace Framework
         DLLEXPORT void update() override;
         DLLEXPORT void beginFrame(
             bool fill2D, bool fill3D, int fillColor) override;
-        DLLEXPORT void renderKamera(Kam3D* zKamera) override;
+        DLLEXPORT void renderKamera(Cam3D* zKamera) override;
         DLLEXPORT void presentFrame() override;
-        DLLEXPORT Textur* createOrGetTextur(const char* name, Image* b) override;
+        DLLEXPORT Texture* createOrGetTexture(const char* name, Image* b) override;
         DLLEXPORT Image* zUIRenderImage() const override;
 
         DLLEXPORT virtual DXBuffer* createStructuredBuffer(int eSize) override;
@@ -171,7 +171,7 @@ namespace Framework
         ID3D11Device* d3d11Device;
         ID3D11DeviceContext* d3d11Context;
         IDXGISwapChain* d3d11SpawChain;
-        Textur* uiTextur;
+        Texture* uiTexture;
         DX11VertexShader* vertexShader;
         DX11PixelShader* pixelShader;
         ID3D11SamplerState* sampleState;
@@ -182,15 +182,15 @@ namespace Framework
         ID3D11DepthStencilState* depthDisabledStencilState;
         ID3D11BlendState* blendStateAlphaBlend;
         D3D11_VIEWPORT* vp;
-        TexturModel* texturModel;
-        TexturList* texturRegister;
-        Textur* defaultTextur;
+        TextureModel* texturModel;
+        TextureList* texturRegister;
+        Texture* defaultTexture;
         DX11StructuredBuffer* diffuseLights;
         DX11StructuredBuffer* pointLights;
         Mat4<float> matrixBuffer[MAX_KNOCHEN_ANZ];
         Mat4<float> viewAndProj[2];
         Vec3<float> kamPos;
-        Ebene3D<float> frustrum[6];
+        Plane3D<float> frustrum[6];
         int lastModelId = -1;
 
         void renderObject(Model3D* zObj);
@@ -215,10 +215,10 @@ namespace Framework
         DLLEXPORT void update() override;
         DLLEXPORT void beginFrame(
             bool fill2D, bool fill3D, int fillColor) override;
-        DLLEXPORT void renderKamera(Kam3D* zKamera) override;
-        DLLEXPORT void renderKamera(Kam3D* zKamera, Textur* zTarget) override;
+        DLLEXPORT void renderKamera(Cam3D* zKamera) override;
+        DLLEXPORT void renderKamera(Cam3D* zKamera, Texture* zTarget) override;
         DLLEXPORT void presentFrame() override;
-        DLLEXPORT Textur* createOrGetTextur(const char* name, Image* b) override;
+        DLLEXPORT Texture* createOrGetTexture(const char* name, Image* b) override;
         DLLEXPORT Image* zUIRenderImage() const override;
         DLLEXPORT virtual DXBuffer* createStructuredBuffer(int eSize) override;
         //! Checks whether a sphere is in the visible space of the world and
@@ -260,10 +260,10 @@ namespace Framework
         Mat4<float> matrixBuffer[MAX_KNOCHEN_ANZ];
         Mat4<float> viewAndProj[2];
         Vec3<float> kamPos;
-        Ebene3D<float> frustrum[6];
-        TexturModel* texturModel;
-        Textur* uiTextur;
-        TexturList* texturRegister;
+        Plane3D<float> frustrum[6];
+        TextureModel* texturModel;
+        Texture* uiTexture;
+        TextureList* texturRegister;
         DX12VertexShader* vertexShader;
         DX12PixelShader* pixelShader;
 
@@ -280,11 +280,11 @@ namespace Framework
         DLLEXPORT void update() override;
         DLLEXPORT void beginFrame(
             bool fill2D, bool fill3D, int fillColor) override;
-        DLLEXPORT void renderKamera(Kam3D* zKamera) override;
-        //! TODO: DLLEXPORT void renderKamera( Kam3D* zKamera, Textur* zTarget )
+        DLLEXPORT void renderKamera(Cam3D* zKamera) override;
+        //! TODO: DLLEXPORT void renderKamera( Cam3D* zKamera, Texture* zTarget )
         //! override;
         DLLEXPORT void presentFrame() override;
-        DLLEXPORT Textur* createOrGetTextur(const char* name, Image* b) override;
+        DLLEXPORT Texture* createOrGetTexture(const char* name, Image* b) override;
         DLLEXPORT Image* zUIRenderImage() const override;
         DLLEXPORT virtual DXBuffer* createStructuredBuffer(int eSize) override;
         //! Checks whether a sphere is in the visible space of the world and

HashMap.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <functional>
 
@@ -50,7 +50,7 @@ namespace Framework
         {
             while (bucketIndex < bucketCount
                    && (!buckets[bucketIndex]
-                       || buckets[bucketIndex]->getEintragAnzahl() == 0))
+                       || buckets[bucketIndex]->getEntryCount() == 0))
             {
                 bucketIndex++;
                 iterator = ArrayIterator<MapEntry<K, V>>(0, 0);
@@ -94,7 +94,7 @@ namespace Framework
             if (iterator && iterator.hasNext()) return 1;
             int ind = bucketIndex + 1;
             while (ind < bucketCount
-                   && (!buckets[ind] || buckets[ind]->getEintragAnzahl() == 0))
+                   && (!buckets[ind] || buckets[ind]->getEntryCount() == 0))
                 ind++;
             return ind < bucketCount;
         }
@@ -145,7 +145,7 @@ namespace Framework
                 bucketIndex++;
                 while (bucketIndex < bucketCount
                        && (!buckets[bucketIndex]
-                           || buckets[bucketIndex]->getEintragAnzahl() == 0))
+                           || buckets[bucketIndex]->getEntryCount() == 0))
                     bucketIndex++;
                 if (bucketIndex < bucketCount)
                     this->iterator = buckets[bucketIndex]->begin();

Image.cpp

@@ -245,7 +245,7 @@ void Image::drawFlatDreieckTexturAlpha(int y1,
     {
         const double xStart = m1 * y + b1;
         const double xEnd = m2 * y + b2;
-        drawLinieHTexturAlpha(Vec2<double>(xStart, y),
+        drawLineHTextureAlpha(Vec2<double>(xStart, y),
             xEnd - xStart,
             Vec2<double>(tx_1, ty_1),
             Vec2<double>(tx_2, ty_2),
@@ -266,7 +266,7 @@ void Image::drawLinieHTextur(Vec2<double> p,
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
     {
-        drawLinieHTexturAlpha(p, len, ta, tb, txo, tyo, textur);
+        drawLineHTextureAlpha(p, len, ta, tb, txo, tyo, textur);
         return;
     }
     if (len < 0)
@@ -306,7 +306,7 @@ void Image::drawLinieHTextur(Vec2<double> p,
     rend = 1;
 }
 
-void Image::drawLinieHTexturAlpha(Vec2<double> p,
+void Image::drawLineHTextureAlpha(Vec2<double> p,
     double len,
     Vec2<double> ta,
     Vec2<double> tb,
@@ -2241,7 +2241,7 @@ void Image::drawDreieckTextur(Punkt a,
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
     {
-        drawDreieckTexturAlpha(a, b, c, ta, tb, tc, textur);
+        drawTriangleTextureAlpha(a, b, c, ta, tb, tc, textur);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -2507,7 +2507,7 @@ void Image::drawDreieckAlpha(
     rend = 1;
 }
 
-void Image::drawDreieckTexturAlpha(Punkt a,
+void Image::drawTriangleTextureAlpha(Punkt a,
     Punkt b,
     Punkt c,
     Punkt ta,
@@ -2936,7 +2936,7 @@ ImageView::~ImageView()
     if (bild) bild->release();
 }
 
-void ImageView::doMausEreignis(MausEreignis& me, bool userRet) // calls Mak
+void ImageView::doMouseEvent(MouseEvent& me, bool userRet) // calls Mak
 {
     if (userRet)
     {
@@ -3072,15 +3072,15 @@ Drawable* ImageView::dublizieren() const // creates a copy of the drawing
     ImageView* obj = new ImageView();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStyle(style);
     obj->setHintergrundFarbe(hintergrundFarbe);
     if (hintergrundFeld)
-        obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
+        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
     if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
     if (hintergrundImage)
         obj->setHintergrundImage(
@@ -3098,7 +3098,7 @@ Image* Framework::ladeImage(const char* pfad, Text* zError)
     if (!(txt->istGleich(".bmp") || txt->istGleich(".jpg")
             || txt->istGleich(".gif") || txt->istGleich(".png")))
     {
-        zError->setText("Die Angegebene Datei ist keine gueltige ImageFile!");
+        zError->setText("Die Angegebene File ist keine gueltige ImageFile!");
         txt->release();
         return 0;
     }

Image.h

@@ -12,7 +12,7 @@ namespace Framework
     class VScrollBar;    //! Scroll.h
     class HScrollBar;    //! Scroll.h
     class Border;        //! Border.h
-    struct MausEreignis; //! MouseEvent.h
+    struct MouseEvent; //! MouseEvent.h
     class Text;          //! Text.h
 #endif
 
@@ -85,7 +85,7 @@ namespace Framework
             double txo,
             double tyo,
             const Image& textur);
-        void drawLinieHTexturAlpha(Vec2<double> p,
+        void drawLineHTextureAlpha(Vec2<double> p,
             double length,
             Vec2<double> ta,
             Vec2<double> tb,
@@ -374,7 +374,7 @@ namespace Framework
         //! \param tb The coordinates of b in the texture
         //! \param tc The coordinates of c in the texture
         //! \param textur The image to use as texture
-        DLLEXPORT void drawDreieckTexturAlpha(Punkt a,
+        DLLEXPORT void drawTriangleTextureAlpha(Punkt a,
             Punkt b,
             Punkt c,
             Punkt ta,
@@ -499,7 +499,7 @@ namespace Framework
     protected:
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The event
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor

InitFile.cpp

@@ -5,16 +5,16 @@
 
 using namespace Framework;
 
-// Contents of the InitDatei class from InitFile.h
+// Contents of the InitFile class from InitFile.h
 // Constructor
-InitDatei::InitDatei()
+InitFile::InitFile()
     : ReferenceCounter(),
       pfad(new Text()),
       name(new RCArray<Text>()),
       wert(new RCArray<Text>())
 {}
 
-InitDatei::InitDatei(Text* pfad)
+InitFile::InitFile(Text* pfad)
     : ReferenceCounter(),
       pfad(new Text()),
       name(new RCArray<Text>()),
@@ -23,7 +23,7 @@ InitDatei::InitDatei(Text* pfad)
     setPfad(pfad);
 }
 
-InitDatei::InitDatei(const char* pfad)
+InitFile::InitFile(const char* pfad)
     : ReferenceCounter(),
       pfad(new Text()),
       name(new RCArray<Text>()),
@@ -33,7 +33,7 @@ InitDatei::InitDatei(const char* pfad)
 }
 
 // Destructor
-InitDatei::~InitDatei()
+InitFile::~InitFile()
 {
     pfad->release();
     name->release();
@@ -41,22 +41,22 @@ InitDatei::~InitDatei()
 }
 
 // non-constant
-void InitDatei::setPfad(Text* pfad)
+void InitFile::setPfad(Text* pfad)
 {
     this->pfad->setText(*pfad);
     pfad->release();
 }
 
-void InitDatei::setPfad(const char* pfad)
+void InitFile::setPfad(const char* pfad)
 {
     this->pfad->setText(pfad);
 }
 
-bool InitDatei::laden()
+bool InitFile::laden()
 {
-    Datei* dat = new Datei();
-    dat->setDatei(pfad->getText());
-    if (!dat->open(Datei::Style::lesen))
+    File* dat = new File();
+    dat->setFile(pfad->getText());
+    if (!dat->open(File::Style::lesen))
     {
         dat->release();
         return 0;
@@ -79,7 +79,7 @@ bool InitDatei::laden()
     return 1;
 }
 
-bool InitDatei::addWert(Text* name, Text* wert)
+bool InitFile::addWert(Text* name, Text* wert)
 {
     if (!wertExistiert(name->getText()))
     {
@@ -94,12 +94,12 @@ bool InitDatei::addWert(Text* name, Text* wert)
     return 0;
 }
 
-bool InitDatei::addWert(const char* name, const char* wert)
+bool InitFile::addWert(const char* name, const char* wert)
 {
     return addWert(new Text(name), new Text(wert));
 }
 
-bool InitDatei::setWert(Text* name, Text* wert)
+bool InitFile::setWert(Text* name, Text* wert)
 {
     if (!wertExistiert(name->getText()))
     {
@@ -123,36 +123,36 @@ bool InitDatei::setWert(Text* name, Text* wert)
     return 0;
 }
 
-bool InitDatei::setWert(const char* name, const char* wert)
+bool InitFile::setWert(const char* name, const char* wert)
 {
     return setWert(new Text(name), new Text(wert));
 }
 
-bool InitDatei::setWert(int num, Text* wert)
+bool InitFile::setWert(int num, Text* wert)
 {
     bool result = setWert(num, wert->getText());
     wert->release();
     return result;
 }
 
-bool InitDatei::setWert(int num, const char* wert)
+bool InitFile::setWert(int num, const char* wert)
 {
-    if (num >= name->getEintragAnzahl()) return 0;
+    if (num >= name->getEntryCount()) return 0;
     this->wert->z(num)->setText(wert);
     return 1;
 }
 
-bool InitDatei::removeWert(Text* name)
+bool InitFile::removeWert(Text* name)
 {
     bool result = removeWert(name->getText());
     name->release();
     return result;
 }
 
-bool InitDatei::removeWert(const char* name)
+bool InitFile::removeWert(const char* name)
 {
     if (!wertExistiert(name)) return 0;
-    for (int i = 0; i < wert->getEintragAnzahl(); ++i)
+    for (int i = 0; i < wert->getEntryCount(); ++i)
     {
         if (this->name->z(i)->istGleich(name))
         {
@@ -164,29 +164,29 @@ bool InitDatei::removeWert(const char* name)
     return 0;
 }
 
-bool InitDatei::removeWert(int num)
+bool InitFile::removeWert(int num)
 {
-    if (num >= wert->getEintragAnzahl()) return 0;
+    if (num >= wert->getEntryCount()) return 0;
     this->name->remove(num);
     this->wert->remove(num);
     return 1;
 }
 
-void InitDatei::removeAlle()
+void InitFile::removeAlle()
 {
-    while (wert->getEintragAnzahl() > 0)
+    while (wert->getEntryCount() > 0)
     {
         this->name->remove(0);
         this->wert->remove(0);
     }
 }
 
-bool InitDatei::speichern()
+bool InitFile::speichern()
 {
-    Datei* dat = new Datei();
-    dat->setDatei(pfad->getText());
+    File* dat = new File();
+    dat->setFile(pfad->getText());
     if (!dat->existiert()) dat->erstellen();
-    if (!dat->open(Datei::Style::schreiben))
+    if (!dat->open(File::Style::schreiben))
     {
         dat->release();
         return 0;
@@ -208,19 +208,19 @@ bool InitDatei::speichern()
 }
 
 // constant
-int InitDatei::getWertAnzahl() const
+int InitFile::getWertAnzahl() const
 {
-    return name->getEintragAnzahl();
+    return name->getEntryCount();
 }
 
-bool InitDatei::wertExistiert(Text* name)
+bool InitFile::wertExistiert(Text* name)
 {
     bool result = wertExistiert(name->getText());
     name->release();
     return result;
 }
 
-bool InitDatei::wertExistiert(const char* name)
+bool InitFile::wertExistiert(const char* name)
 {
     for (Text* n : *this->name)
     {
@@ -229,14 +229,14 @@ bool InitDatei::wertExistiert(const char* name)
     return 0;
 }
 
-int InitDatei::getWertNummer(Text* name)
+int InitFile::getWertNummer(Text* name)
 {
     int result = getWertNummer(name->getText());
     name->release();
     return result;
 }
 
-int InitDatei::getWertNummer(const char* name)
+int InitFile::getWertNummer(const char* name)
 {
     int i = 0;
     for (Text* n : *this->name)
@@ -246,14 +246,14 @@ int InitDatei::getWertNummer(const char* name)
     return -1;
 }
 
-Text* InitDatei::getWert(Text* name)
+Text* InitFile::getWert(Text* name)
 {
     Text* result = getWert(name->getText());
     name->release();
     return result;
 }
 
-Text* InitDatei::getWert(const char* name)
+Text* InitFile::getWert(const char* name)
 {
     auto v = wert->begin();
     for (auto n = this->name->begin(); n; n++, v++)
@@ -263,20 +263,20 @@ Text* InitDatei::getWert(const char* name)
     return 0;
 }
 
-Text* InitDatei::getWert(int num)
+Text* InitFile::getWert(int num)
 {
-    if (num >= name->getEintragAnzahl()) return 0;
+    if (num >= name->getEntryCount()) return 0;
     return wert->get(num);
 }
 
-Text* InitDatei::zWert(Text* name)
+Text* InitFile::zWert(Text* name)
 {
     Text* result = zWert(name->getText());
     name->release();
     return result;
 }
 
-Text* InitDatei::zWert(const char* name)
+Text* InitFile::zWert(const char* name)
 {
     auto v = wert->begin();
     for (auto n = this->name->begin(); n; n++, v++)
@@ -286,30 +286,30 @@ Text* InitDatei::zWert(const char* name)
     return 0;
 }
 
-Text* InitDatei::zWert(int num)
+Text* InitFile::zWert(int num)
 {
-    if (num >= wert->getEintragAnzahl()) return 0;
+    if (num >= wert->getEntryCount()) return 0;
     return wert->z(num);
 }
 
-Text* InitDatei::getName(int num)
+Text* InitFile::getName(int num)
 {
-    if (num >= name->getEintragAnzahl()) return 0;
+    if (num >= name->getEntryCount()) return 0;
     return name->get(num);
 }
 
-Text* InitDatei::zName(int num)
+Text* InitFile::zName(int num)
 {
-    if (num >= name->getEintragAnzahl()) return 0;
+    if (num >= name->getEntryCount()) return 0;
     return name->z(num);
 }
 
-Text* InitDatei::getPfad() const
+Text* InitFile::getPfad() const
 {
     return dynamic_cast<Text*>(pfad->getThis());
 }
 
-Text* InitDatei::zPfad() const
+Text* InitFile::zPfad() const
 {
     return pfad;
 }

InitFile.h

@@ -1,5 +1,5 @@
-#ifndef InitDatei_H
-#define InitDatei_H
+#ifndef InitFile_H
+#define InitFile_H
 
 #include "Array.h"
 
@@ -9,7 +9,7 @@ namespace Framework
 
     //! Manages initialization files where variables are stored in the format
     //! name=value
-    class InitDatei : public virtual ReferenceCounter
+    class InitFile : public virtual ReferenceCounter
     {
     private:
         Text* pfad;
@@ -18,15 +18,15 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT InitDatei();
+        DLLEXPORT InitFile();
         //! Constructor
         //! \param pfad The path to the file
-        DLLEXPORT InitDatei(Text* pfad);
+        DLLEXPORT InitFile(Text* pfad);
         //! Constructor
         //! \param pfad The path to the file
-        DLLEXPORT InitDatei(const char* pfad);
+        DLLEXPORT InitFile(const char* pfad);
         //! Destructor
-        DLLEXPORT ~InitDatei();
+        DLLEXPORT ~InitFile();
         //! Sets the path to the file
         //! \param pfad The path to the file
         DLLEXPORT void setPfad(Text* pfad);

JSON.cpp

@@ -253,12 +253,12 @@ AbstractElement* JSONArray::zAbstractValue(int i) const
 
 int JSONArray::getLength() const
 {
-    return array->getEintragAnzahl();
+    return array->getEntryCount();
 }
 
 bool JSONArray::isValueOfType(int i, AbstractType type) const
 {
-    return i >= 0 && i < array->getEintragAnzahl()
+    return i >= 0 && i < array->getEntryCount()
         && array->z(i)->getType() == type;
 }
 
@@ -367,7 +367,7 @@ bool JSONObject::addValue(Text field, JSONValue* value)
 
 bool JSONObject::removeValue(Text field)
 {
-    for (int i = 0; i < fields->getEintragAnzahl(); i++)
+    for (int i = 0; i < fields->getEntryCount(); i++)
     {
         if (fields->get(i).istGleich(field))
         {
@@ -386,7 +386,7 @@ bool JSONObject::hasValue(Text field) const
 
 JSONValue* JSONObject::getValue(Text field) const
 {
-    for (int i = 0; i < fields->getEintragAnzahl(); i++)
+    for (int i = 0; i < fields->getEntryCount(); i++)
     {
         if (fields->get(i).istGleich(field)) return values->get(i);
     }
@@ -395,7 +395,7 @@ JSONValue* JSONObject::getValue(Text field) const
 
 JSONValue* JSONObject::zValue(Text field) const
 {
-    for (int i = 0; i < fields->getEintragAnzahl(); i++)
+    for (int i = 0; i < fields->getEntryCount(); i++)
     {
         if (fields->get(i).istGleich(field)) return values->z(i);
     }
@@ -429,12 +429,12 @@ AbstractElement* Framework::JSON::JSONObject::zAbstractValue(int i) const
 
 int JSONObject::getFieldCount() const
 {
-    return fields->getEintragAnzahl();
+    return fields->getEntryCount();
 }
 
 bool JSONObject::isValueOfType(Text field, AbstractType type) const
 {
-    for (int i = 0; i < fields->getEintragAnzahl(); i++)
+    for (int i = 0; i < fields->getEntryCount(); i++)
     {
         if (fields->get(i).istGleich(field))
             return values->z(i)->getType() == type;
@@ -474,9 +474,9 @@ JSONValue* JSONObject::clone() const
 
 JSONValue* JSON::loadJSONFromFile(Text path)
 {
-    Datei d;
-    d.setDatei(path);
-    if (!d.open(Datei::Style::lesen))
+    File d;
+    d.setFile(path);
+    if (!d.open(File::Style::lesen))
     {
         return new JSONValue();
     }

JsonEditor.cpp

@@ -528,7 +528,7 @@ void Framework::JSON::EditableJsonElement::setContentOnly(const char** content,
     {
         const char* current = (*content) + startPos++;
         const char* next = 0;
-        if (afterList.getEintragAnzahl())
+        if (afterList.getEntryCount())
         {
             next = afterList.get(0)->getContent();
         }
@@ -547,7 +547,7 @@ void Framework::JSON::EditableJsonElement::setContentOnly(const char** content,
         }
         if (!(*content)[startPos])
         {
-            if (!afterList.getEintragAnzahl())
+            if (!afterList.getEntryCount())
             {
                 break;
             }
@@ -811,7 +811,7 @@ bool Framework::JSON::EditableJsonElement::isValueValid(
     }
     RCArray<Regex::Result>* results
         = valueValidator->match(value, value.getLength());
-    bool ok = results->getEintragAnzahl() == 1;
+    bool ok = results->getEntryCount() == 1;
     results->release();
     return ok;
 }
@@ -862,11 +862,11 @@ void Framework::JSON::EditableJsonElement::setContent(
         }
         next->setContent(content, startPos, afterList);
     }
-    else if (afterList.getEintragAnzahl())
+    else if (afterList.getEntryCount())
     {
         if (openingControllChar)
         {
-            while (afterList.getEintragAnzahl()
+            while (afterList.getEntryCount()
                    && (!lastChild
                        || !((openingControllChar == '['
                                 && lastChild->closingControllChar == ']')
@@ -903,7 +903,7 @@ void Framework::JSON::EditableJsonElement::setContent(
         }
         EditableJsonElement* p = parent;
         EditableJsonElement* c = this;
-        while (afterList.getEintragAnzahl())
+        while (afterList.getEntryCount())
         {
             if (p)
             {
@@ -917,7 +917,7 @@ void Framework::JSON::EditableJsonElement::setContent(
                     }
                 }
                 while (
-                    afterList.getEintragAnzahl()
+                    afterList.getEntryCount()
                     && (!p->lastChild
                         || !((p->openingControllChar == '['
                                  && p->lastChild->closingControllChar == ']')
@@ -956,7 +956,7 @@ void Framework::JSON::EditableJsonElement::setContent(
             }
             else
             {
-                while (afterList.getEintragAnzahl())
+                while (afterList.getEntryCount())
                 {
                     EditableJsonElement* next = afterList.get(0);
                     afterList.remove(0);
@@ -1368,7 +1368,7 @@ SyntaxError Framework::JSON::EditableJsonElement::getError(int column) const
 
 bool Framework::JSON::EditableJsonElement::hasError() const
 {
-    return errors.getEintragAnzahl() > 0;
+    return errors.getEntryCount() > 0;
 }
 
 void Framework::JSON::EditableJsonElement::makeVisible()
@@ -1716,7 +1716,7 @@ JsonEditor::~JsonEditor()
     errorDescription->release();
 }
 
-void Framework::JSON::JsonEditor::doMausEreignis(MausEreignis& me, bool userRet)
+void Framework::JSON::JsonEditor::doMouseEvent(MouseEvent& me, bool userRet)
 {
     LOCK(&cs);
     rend |= cursorPos.x != me.mx || cursorPos.y != me.my;
@@ -2111,7 +2111,7 @@ void Framework::JSON::JsonEditor::setValidator(
     // if (content) validate(); TODO: validate attributes
 }
 
-void Framework::JSON::JsonEditor::doTastaturEreignis(TastaturEreignis& te)
+void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
 {
     LOCK(&cs);
     if (!textCursor.line)

JsonEditor.h

@@ -224,8 +224,8 @@ namespace Framework
         protected:
             //! Processes mouse messages
             //! \param me The event triggered by the mouse input
-            DLLEXPORT void doMausEreignis(
-                MausEreignis& me, bool userRet) override;
+            DLLEXPORT void doMouseEvent(
+                MouseEvent& me, bool userRet) override;
             DLLEXPORT EditorPosition getScreenPosition(int localX, int localY);
             DLLEXPORT void deleteSelection();
             DLLEXPORT void unifyPosition(EditorPosition& pos);
@@ -241,7 +241,7 @@ namespace Framework
 
             //! Processes a keyboard event. Called automatically by the
             //! framework \param te The event
-            DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
+            DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
 
             //! Updates the drawing background
             //! \param tickVal The elapsed time in seconds since the last

KSGTFile.cpp

@@ -5,15 +5,15 @@
 
 using namespace Framework;
 
-// Contents of the KSGTDatei class from KSGTFile.h
+// Contents of the KSGTFile class from KSGTFile.h
 // Constructor
-KSGTDatei::KSGTDatei()
+KSGTFile::KSGTFile()
     : ReferenceCounter(),
       pfad(new Text()),
       data(new RCArray<RCArray<Text>>())
 {}
 
-KSGTDatei::KSGTDatei(const char* pfad)
+KSGTFile::KSGTFile(const char* pfad)
     : ReferenceCounter(),
       pfad(new Text()),
       data(new RCArray<RCArray<Text>>())
@@ -21,7 +21,7 @@ KSGTDatei::KSGTDatei(const char* pfad)
     setPfad(pfad);
 }
 
-KSGTDatei::KSGTDatei(Text* pfad)
+KSGTFile::KSGTFile(Text* pfad)
     : ReferenceCounter(),
       pfad(new Text()),
       data(new RCArray<RCArray<Text>>())
@@ -30,25 +30,25 @@ KSGTDatei::KSGTDatei(Text* pfad)
 }
 
 // Destructor
-KSGTDatei::~KSGTDatei()
+KSGTFile::~KSGTFile()
 {
     pfad->release();
     data->release();
 }
 
 // non-constant
-void KSGTDatei::setPfad(const char* pfad)
+void KSGTFile::setPfad(const char* pfad)
 {
     this->pfad->setText(pfad);
 }
 
-void KSGTDatei::setPfad(Text* pfad)
+void KSGTFile::setPfad(Text* pfad)
 {
     this->pfad->setText(*pfad);
     pfad->release();
 }
 
-bool KSGTDatei::laden()
+bool KSGTFile::laden()
 {
     std::ifstream inf;
     inf.open(pfad->getText(), std::ios::binary);
@@ -96,7 +96,7 @@ bool KSGTDatei::laden()
     return 1;
 }
 
-bool KSGTDatei::addZeile(int feldAnzahl, RCArray<Text>* zWert)
+bool KSGTFile::addZeile(int feldAnzahl, RCArray<Text>* zWert)
 {
     auto line = new RCArray<Text>();
     data->add(line);
@@ -105,7 +105,7 @@ bool KSGTDatei::addZeile(int feldAnzahl, RCArray<Text>* zWert)
     return 1;
 }
 
-bool KSGTDatei::setZeile(int zeile, int feldAnzahl, RCArray<Text>* zWert)
+bool KSGTFile::setZeile(int zeile, int feldAnzahl, RCArray<Text>* zWert)
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA) return 0;
@@ -116,7 +116,7 @@ bool KSGTDatei::setZeile(int zeile, int feldAnzahl, RCArray<Text>* zWert)
     return 1;
 }
 
-bool KSGTDatei::removeZeile(int zeile)
+bool KSGTFile::removeZeile(int zeile)
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA) return 0;
@@ -124,7 +124,7 @@ bool KSGTDatei::removeZeile(int zeile)
     return 1;
 }
 
-bool KSGTDatei::addFeld(int zeile, int pos, Text* wert)
+bool KSGTFile::addField(int zeile, int pos, Text* wert)
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA)
@@ -143,12 +143,12 @@ bool KSGTDatei::addFeld(int zeile, int pos, Text* wert)
     return 1;
 }
 
-bool KSGTDatei::addFeld(int zeile, int pos, const char* wert)
+bool KSGTFile::addField(int zeile, int pos, const char* wert)
 {
-    return addFeld(zeile, pos, new Text(wert));
+    return addField(zeile, pos, new Text(wert));
 }
 
-bool KSGTDatei::addFeld(int zeile, Text* wert)
+bool KSGTFile::addField(int zeile, Text* wert)
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA)
@@ -161,12 +161,12 @@ bool KSGTDatei::addFeld(int zeile, Text* wert)
     return 1;
 }
 
-bool KSGTDatei::addFeld(int zeile, const char* wert)
+bool KSGTFile::addField(int zeile, const char* wert)
 {
-    return addFeld(zeile, new Text(wert));
+    return addField(zeile, new Text(wert));
 }
 
-bool KSGTDatei::setFeld(int zeile, int feld, Text* wert)
+bool KSGTFile::setField(int zeile, int feld, Text* wert)
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA)
@@ -185,12 +185,12 @@ bool KSGTDatei::setFeld(int zeile, int feld, Text* wert)
     return 1;
 }
 
-bool KSGTDatei::setFeld(int zeile, int feld, const char* wert)
+bool KSGTFile::setField(int zeile, int feld, const char* wert)
 {
-    return setFeld(zeile, feld, new Text(wert));
+    return setField(zeile, feld, new Text(wert));
 }
 
-bool KSGTDatei::removeFeld(int zeile, int feld)
+bool KSGTFile::removeField(int zeile, int feld)
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA) return 0;
@@ -200,10 +200,10 @@ bool KSGTDatei::removeFeld(int zeile, int feld)
     return 1;
 }
 
-bool KSGTDatei::speichern()
+bool KSGTFile::speichern()
 {
     if (!pfad->getLength()) return 0;
-    if (!DateiExistiert(pfad->getText())) DateiPfadErstellen(pfad->getText());
+    if (!FileExists(pfad->getText())) FilePathCreate(pfad->getText());
     std::ofstream of(pfad->getText(), std::ios::binary);
     if (!of.good() || !of.is_open()) return 0;
     int i = 0;
@@ -222,19 +222,19 @@ bool KSGTDatei::speichern()
 }
 
 // constant
-int KSGTDatei::getZeilenAnzahl() const
+int KSGTFile::getZeilenAnzahl() const
 {
-    return data->getEintragAnzahl();
+    return data->getEntryCount();
 }
 
-int KSGTDatei::getFeldAnzahl(int zeile) const
+int KSGTFile::getFeldAnzahl(int zeile) const
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA) return 0;
-    return data->z(zeile)->getEintragAnzahl();
+    return data->z(zeile)->getEntryCount();
 }
 
-Text* KSGTDatei::getFeld(int zeile, int feld) const
+Text* KSGTFile::getField(int zeile, int feld) const
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA) return 0;
@@ -243,7 +243,7 @@ Text* KSGTDatei::getFeld(int zeile, int feld) const
     return data->z(zeile)->get(feld);
 }
 
-Text* KSGTDatei::zFeld(int zeile, int feld) const
+Text* KSGTFile::zField(int zeile, int feld) const
 {
     int zA = getZeilenAnzahl();
     if (zeile >= zA) return 0;

KSGTFile.h

@@ -1,5 +1,5 @@
-#ifndef KSGTDatei_H
-#define KSGTDatei_H
+#ifndef KSGTFile_H
+#define KSGTFile_H
 
 #include "Array.h"
 
@@ -8,7 +8,7 @@ namespace Framework
     class Text;
 
     //! Manages a file where data is stored in tabular form
-    class KSGTDatei : public virtual ReferenceCounter
+    class KSGTFile : public virtual ReferenceCounter
     {
     private:
         Text* pfad;
@@ -16,15 +16,15 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT KSGTDatei();
+        DLLEXPORT KSGTFile();
         //! Constructor
         //! \param pfad The path to the file
-        DLLEXPORT KSGTDatei(const char* pfad);
+        DLLEXPORT KSGTFile(const char* pfad);
         //! Constructor
         //! \param pfad The path to the file
-        DLLEXPORT KSGTDatei(Text* pfad);
+        DLLEXPORT KSGTFile(Text* pfad);
         //! Destructor
-        DLLEXPORT ~KSGTDatei();
+        DLLEXPORT ~KSGTFile();
         //! Sets the path to the file
         //! \param pfad The path to the file
         DLLEXPORT void setPfad(const char* pfad);
@@ -58,44 +58,44 @@ namespace Framework
         //! \param wert The value to store
         //! \return 1 if the value was successfully added. 0 if the row
         //! does not exist or pos is too large
-        DLLEXPORT bool addFeld(int zeile, int pos, Text* wert);
+        DLLEXPORT bool addField(int zeile, int pos, Text* wert);
         //! Adds a value to a specific row
         //! \param zeile The index of the row to add a value to
         //! \param pos The position in the row where the value should be added
         //! \param wert The value to store
         //! \return 1 if the value was successfully added. 0 if the row
         //! does not exist or pos is too large
-        DLLEXPORT bool addFeld(int zeile, int pos, const char* wert);
+        DLLEXPORT bool addField(int zeile, int pos, const char* wert);
         //! Adds a value at the end of a specific row
         //! \param zeile The index of the row to add a value to
         //! \param wert The value to store \return 1 if the value was
         //! successfully added. 0 if the row does not exist
-        DLLEXPORT bool addFeld(int zeile, Text* wert);
+        DLLEXPORT bool addField(int zeile, Text* wert);
         //! Adds a value at the end of a specific row
         //! \param zeile The index of the row to add a value to
         //! \param wert The value to store \return 1 if the value was
         //! successfully added. 0 if the row does not exist
-        DLLEXPORT bool addFeld(int zeile, const char* wert);
+        DLLEXPORT bool addField(int zeile, const char* wert);
         //! Sets a specific value in a row
         //! \param zeile The index of the row where a value should be changed
         //! \param feld The position in the row where the value should be set
         //! \param wert The value to store
         //! \return 1 if the value was successfully replaced. 0 if the row
         //! or the value does not exist
-        DLLEXPORT bool setFeld(int zeile, int feld, Text* wert);
+        DLLEXPORT bool setField(int zeile, int feld, Text* wert);
         //! Sets a specific value in a row
         //! \param zeile The index of the row where a value should be changed
         //! \param feld The position in the row where the value should be set
         //! \param wert The value to store
         //! \return 1 if the value was successfully replaced. 0 if the row
         //! or the value does not exist
-        DLLEXPORT bool setFeld(int zeile, int feld, const char* wert);
+        DLLEXPORT bool setField(int zeile, int feld, const char* wert);
         //! Removes a specific value
         //! \param zeile The index of the row from which a value should be deleted
         //! \param feld The position in the row where the value should be deleted
         //! \return 1 if the value was successfully deleted. 0 if the row
         //! or the value does not exist
-        DLLEXPORT bool removeFeld(int zeile, int feld);
+        DLLEXPORT bool removeField(int zeile, int feld);
         //! Saves the table to the file
         //! \return 1 if the table was successfully saved
         DLLEXPORT bool speichern();
@@ -108,12 +108,12 @@ namespace Framework
         //! \param zeile The index of the row where the value is stored
         //! \param feld The index of the value in the row
         //! \return The stored value with increased reference counter
-        DLLEXPORT Text* getFeld(int zeile, int feld) const;
+        DLLEXPORT Text* getField(int zeile, int feld) const;
         //! Returns a specific stored value
         //! \param zeile The index of the row where the value is stored
         //! \param feld The index of the value in the row
         //! \return The stored value without increased reference counter
-        DLLEXPORT Text* zFeld(int zeile, int feld) const;
+        DLLEXPORT Text* zField(int zeile, int feld) const;
     };
 } // namespace Framework
 

KeyboardEvent.cpp

@@ -2,12 +2,12 @@
 
 using namespace Framework;
 
-bool Framework::_ret1TE(void* param, void* obj, TastaturEreignis te)
+bool Framework::_ret1TE(void* param, void* obj, KeyboardEvent te)
 {
     return 1;
 }
 
-bool Framework::_nurNummernTE(void* param, void* obj, TastaturEreignis te)
+bool Framework::_nurNummernTE(void* param, void* obj, KeyboardEvent te)
 {
     if (te.taste[0] >= '0' && te.taste[0] <= '9') return 1;
     if (te.virtualKey == T_Entf || te.virtualKey == T_BackSpace) return 1;
@@ -17,7 +17,7 @@ bool Framework::_nurNummernTE(void* param, void* obj, TastaturEreignis te)
     return 0;
 }
 
-bool Framework::_nurHexTE(void* param, void* obj, TastaturEreignis te)
+bool Framework::_nurHexTE(void* param, void* obj, KeyboardEvent te)
 {
     if (te.taste[0] >= '0' && te.taste[0] <= '9') return 1;
     if (te.taste[0] >= 'A' && te.taste[0] <= 'F') return 1;

KeyboardEvent.h

@@ -86,7 +86,7 @@ namespace Framework
 #endif
 
     //! Stores the keyboard input from a user
-    struct TastaturEreignis
+    struct KeyboardEvent
     {
         //! Type of input
         int id;
@@ -98,7 +98,7 @@ namespace Framework
         bool verarbeitet;
     };
 
-    typedef std::function<bool(void*, void*, TastaturEreignis)> TastaturAktion;
+    typedef std::function<bool(void*, void*, KeyboardEvent)> TastaturAktion;
 
     //! Default keyboard event callback function
     //! \param param An arbitrary parameter
@@ -106,7 +106,7 @@ namespace Framework
     //! \param te The keyboard event to process
     //! \return (true) if the calling drawing should continue processing
     //! the event. (false) otherwise. Always returns (true)
-    DLLEXPORT bool _ret1TE(void* param, void* obj, TastaturEreignis te);
+    DLLEXPORT bool _ret1TE(void* param, void* obj, KeyboardEvent te);
     //! Default keyboard event callback function
     //! \param param An arbitrary parameter
     //! \param obj The drawing that calls this function
@@ -114,7 +114,7 @@ namespace Framework
     //! \return (true) if the calling drawing should continue processing
     //! the event. (false) otherwise. Only returns (true) if the key is between
     //! '0' and '9', or used for deleting or cursor movement
-    DLLEXPORT bool _nurNummernTE(void* param, void* obj, TastaturEreignis te);
+    DLLEXPORT bool _nurNummernTE(void* param, void* obj, KeyboardEvent te);
     //! Default keyboard event callback function
     //! \param param An arbitrary parameter
     //! \param obj The drawing that calls this function
@@ -122,7 +122,7 @@ namespace Framework
     //! \return (true) if the calling drawing should continue processing
     //! the event. (false) otherwise. Only returns (true) if the key is between
     //! '0' and '9' or 'A' and 'F', or used for deleting or cursor movement
-    DLLEXPORT bool _nurHexTE(void* param, void* obj, TastaturEreignis te);
+    DLLEXPORT bool _nurHexTE(void* param, void* obj, KeyboardEvent te);
 } // namespace Framework
 
 #endif

List.cpp

@@ -14,9 +14,9 @@
 
 using namespace Framework;
 
-// Contents of the AuswahlListe class from List.h
+// Contents of the SelectionList class from List.h
 // Constructor
-AuswahlListe::AuswahlListe()
+SelectionList::SelectionList()
     : DrawableBackground(),
       tfListe(0),
       auswahl(-1),
@@ -32,12 +32,12 @@ AuswahlListe::AuswahlListe()
       schrift(0)
 {
     style = 0;
-    this->setMausEreignis(_ret1ME);
-    this->setTastaturEreignis(_ret1TE);
+    this->setMouseEvent(_ret1ME);
+    this->setKeyboardEvent(_ret1TE);
 }
 
 // Destructor
-AuswahlListe::~AuswahlListe()
+SelectionList::~SelectionList()
 {
     if (tfListe) tfListe->release();
     if (ahImage) ahImage->release();
@@ -51,7 +51,7 @@ AuswahlListe::~AuswahlListe()
     if (schrift) schrift->release();
 }
 
-void AuswahlListe::doMausEreignis(MausEreignis& me, bool userRet)
+void SelectionList::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (!userRet || hatStyleNicht(Style::Erlaubt)) return;
     if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
@@ -118,13 +118,13 @@ void AuswahlListe::doMausEreignis(MausEreignis& me, bool userRet)
     me.verarbeitet = 1;
 }
 
-bool AuswahlListe::hatStyle(int styleSet, int styleCheck) const
+bool SelectionList::hatStyle(int styleSet, int styleCheck) const
 {
     return (styleSet | styleCheck) == styleSet;
 }
 
 // non-constant
-void AuswahlListe::update() // updates the selection list
+void SelectionList::update() // updates the selection list
 {
     int rbr = 0;
     if (rahmen)
@@ -177,7 +177,7 @@ void AuswahlListe::update() // updates the selection list
     rend = 1;
 }
 
-void AuswahlListe::addEintrag(Text* txt) // adds an entry
+void SelectionList::addEintrag(Text* txt) // adds an entry
 {
     TextField* tf = new TextField();
     tf->setStyle(TextField::Style::Center | TextField::Style::Sichtbar
@@ -191,14 +191,14 @@ void AuswahlListe::addEintrag(Text* txt) // adds an entry
     rend = 1;
 }
 
-void AuswahlListe::addEintrag(const char* txt)
+void SelectionList::addEintrag(const char* txt)
 {
     Text* tx = new Text(txt);
     addEintrag(tx);
     rend = 1;
 }
 
-void AuswahlListe::addEintragZ(TextField* tf)
+void SelectionList::addEintragZ(TextField* tf)
 {
     if (!tfListe) tfListe = new RCArray<TextField>();
     if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
@@ -207,7 +207,7 @@ void AuswahlListe::addEintragZ(TextField* tf)
     rend = 1;
 }
 
-void AuswahlListe::addEintrag(
+void SelectionList::addEintrag(
     int pos, Text* txt) // inserts an entry at position pos
 {
     TextField* tf = new TextField();
@@ -222,14 +222,14 @@ void AuswahlListe::addEintrag(
     rend = 1;
 }
 
-void AuswahlListe::addEintrag(int pos, const char* txt)
+void SelectionList::addEintrag(int pos, const char* txt)
 {
     Text* tx = new Text(txt);
     addEintrag(pos, tx);
     rend = 1;
 }
 
-void AuswahlListe::addEintragZ(int pos, TextField* tf)
+void SelectionList::addEintragZ(int pos, TextField* tf)
 {
     if (!tfListe) tfListe = new RCArray<TextField>();
     if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
@@ -238,7 +238,7 @@ void AuswahlListe::addEintragZ(int pos, TextField* tf)
     rend = 1;
 }
 
-void AuswahlListe::setEintrag(
+void SelectionList::setEintrag(
     int pos, Text* txt) // changes the entry at pos
 {
     TextField* tf = 0;
@@ -261,14 +261,14 @@ void AuswahlListe::setEintrag(
     rend = 1;
 }
 
-void AuswahlListe::setEintrag(int pos, const char* txt)
+void SelectionList::setEintrag(int pos, const char* txt)
 {
     Text* tx = new Text(txt);
     setEintrag(pos, tx);
     rend = 1;
 }
 
-void AuswahlListe::setEintragZ(int pos, TextField* tf)
+void SelectionList::setEintragZ(int pos, TextField* tf)
 {
     if (!tfListe) tfListe = new RCArray<TextField>();
     if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
@@ -277,7 +277,7 @@ void AuswahlListe::setEintragZ(int pos, TextField* tf)
     rend = 1;
 }
 
-void AuswahlListe::tauschEintragPos(
+void SelectionList::tauschEintragPos(
     int vpos, int npos) // swaps entry vpos with entry npos
 {
     if (tfListe)
@@ -292,7 +292,7 @@ void AuswahlListe::tauschEintragPos(
     }
 }
 
-void Framework::AuswahlListe::setEintragPos(int vpos, int npos) {
+void Framework::SelectionList::setEintragPos(int vpos, int npos) {
     if (tfListe)
     {
         tfListe->setPosition(vpos, npos);
@@ -305,13 +305,13 @@ void Framework::AuswahlListe::setEintragPos(int vpos, int npos) {
     }
 }
 
-void AuswahlListe::removeEintrag(int pos) // deletes entry at pos
+void SelectionList::removeEintrag(int pos) // deletes entry at pos
 {
     tfListe->remove(pos);
     rend = 1;
 }
 
-void AuswahlListe::setFontZ(
+void SelectionList::setFontZ(
     Font* schrift) // sets the font for the entries
 {
     if (this->schrift) this->schrift->release();
@@ -319,7 +319,7 @@ void AuswahlListe::setFontZ(
     rend = 1;
 }
 
-void AuswahlListe::setVScrollZuEintrag(int eintrag) // scrolls to entry
+void SelectionList::setVScrollZuEintrag(int eintrag) // scrolls to entry
 {
     if (vertikalScrollBar)
     {
@@ -332,7 +332,7 @@ void AuswahlListe::setVScrollZuEintrag(int eintrag) // scrolls to entry
     }
 }
 
-void AuswahlListe::updateVScroll() // scrolls to cursor position or
+void SelectionList::updateVScroll() // scrolls to cursor position or
                                    // down
 {
     if (vertikalScrollBar)
@@ -350,7 +350,7 @@ void AuswahlListe::updateVScroll() // scrolls to cursor position or
     }
 }
 
-void AuswahlListe::setALRZ(Border*
+void SelectionList::setALRZ(Border*
         rahmen) // sets a pointer to the selection border (only without MultiStyled)
 {
     if (aBorder) aBorder->release();
@@ -358,7 +358,7 @@ void AuswahlListe::setALRZ(Border*
     rend = 1;
 }
 
-void AuswahlListe::setALRBreite(
+void SelectionList::setALRBreite(
     int br) // sets the width of the selection border (only without MultiStyled)
 {
     if (!aBorder) aBorder = new LBorder();
@@ -366,7 +366,7 @@ void AuswahlListe::setALRBreite(
     rend = 1;
 }
 
-void AuswahlListe::setALRFarbe(
+void SelectionList::setALRFarbe(
     int fc) // sets the color of the selection border (only without MultiStyled)
 {
     if (!aBorder) aBorder = new LBorder();
@@ -374,33 +374,33 @@ void AuswahlListe::setALRFarbe(
     rend = 1;
 }
 
-void AuswahlListe::setAAFZ(AlphaFeld* buffer) // sets a pointer to the selection
-                                              // AlphaFeld (only without MultiStyled)
+void SelectionList::setAAFZ(AlphaField* buffer) // sets a pointer to the selection
+                                              // AlphaField (only without MultiStyled)
 {
     if (aBuffer) aBuffer->release();
     aBuffer = buffer;
     rend = 1;
 }
 
-void AuswahlListe::setAAFStrength(
+void SelectionList::setAAFStrength(
     int st) // sets the strength of the selection background buffer (only without
             // MultiStyled)
 {
-    if (!aBuffer) aBuffer = new AlphaFeld();
+    if (!aBuffer) aBuffer = new AlphaField();
     aBuffer->setStrength(st);
     rend = 1;
 }
 
-void AuswahlListe::setAAFFarbe(
+void SelectionList::setAAFFarbe(
     int fc) // sets the color of the selection background buffer (only without
             // MultiStyled)
 {
-    if (!aBuffer) aBuffer = new AlphaFeld();
+    if (!aBuffer) aBuffer = new AlphaField();
     aBuffer->setFarbe(fc);
     rend = 1;
 }
 
-void AuswahlListe::setAHImage(
+void SelectionList::setAHImage(
     Image* bild) // sets the selection background image (only without MultiStyled)
 {
     if (!ahImage) ahImage = new Image();
@@ -413,14 +413,14 @@ void AuswahlListe::setAHImage(
     rend = 1;
 }
 
-void AuswahlListe::setAHFarbe(int f) // sets the selection
+void SelectionList::setAHFarbe(int f) // sets the selection
                                       // background color (only without MultiStyled)
 {
     ahFarbe = f;
     rend = 1;
 }
 
-void AuswahlListe::setAHImageZ(
+void SelectionList::setAHImageZ(
     Image* b) // sets a pointer to the background image (only without MultiStyled)
 {
     if (ahImage) ahImage->release();
@@ -428,7 +428,7 @@ void AuswahlListe::setAHImageZ(
     rend = 1;
 }
 
-void AuswahlListe::setALRZ(int pos,
+void SelectionList::setALRZ(int pos,
     Border*
         rahmen) // sets a pointer to the selection border (only with MultiStyled)
 {
@@ -437,7 +437,7 @@ void AuswahlListe::setALRZ(int pos,
     rend = 1;
 }
 
-void AuswahlListe::setALRBreite(int pos,
+void SelectionList::setALRBreite(int pos,
     int br) // sets the width of the selection border (only with MultiStyled)
 {
     if (!aBorderList) aBorderList = new RCArray<Border>();
@@ -446,7 +446,7 @@ void AuswahlListe::setALRBreite(int pos,
     rend = 1;
 }
 
-void AuswahlListe::setALRFarbe(int pos,
+void SelectionList::setALRFarbe(int pos,
     int fc) // sets the color of the selection border (only with MultiStyled)
 {
     if (!aBorderList) aBorderList = new RCArray<Border>();
@@ -455,36 +455,36 @@ void AuswahlListe::setALRFarbe(int pos,
     rend = 1;
 }
 
-void AuswahlListe::setAAFZ(int pos,
-    AlphaFeld*
-        buffer) // sets a pointer to the selection AlphaFeld (only with MultiStyled)
+void SelectionList::setAAFZ(int pos,
+    AlphaField*
+        buffer) // sets a pointer to the selection AlphaField (only with MultiStyled)
 {
-    if (!aBufferListe) aBufferListe = new RCArray<AlphaFeld>();
+    if (!aBufferListe) aBufferListe = new RCArray<AlphaField>();
     aBufferListe->set(buffer, pos);
     rend = 1;
 }
 
-void AuswahlListe::setAAFStrength(
+void SelectionList::setAAFStrength(
     int pos, int st) // sets the strength of the selection background buffer
                      // (only with MultiStyled)
 {
-    if (!aBufferListe) aBufferListe = new RCArray<AlphaFeld>();
-    if (!aBufferListe->z(pos)) aBufferListe->set(new AlphaFeld(), pos);
+    if (!aBufferListe) aBufferListe = new RCArray<AlphaField>();
+    if (!aBufferListe->z(pos)) aBufferListe->set(new AlphaField(), pos);
     aBufferListe->z(pos)->setStrength(st);
     rend = 1;
 }
 
-void AuswahlListe::setAAFFarbe(
+void SelectionList::setAAFFarbe(
     int pos, int fc) // sets the color of the selection background buffer
                      // (only with MultiStyled)
 {
-    if (!aBufferListe) aBufferListe = new RCArray<AlphaFeld>();
-    if (!aBufferListe->z(pos)) aBufferListe->set(new AlphaFeld(), pos);
+    if (!aBufferListe) aBufferListe = new RCArray<AlphaField>();
+    if (!aBufferListe->z(pos)) aBufferListe->set(new AlphaField(), pos);
     aBufferListe->z(pos)->setFarbe(fc);
     rend = 1;
 }
 
-void AuswahlListe::setAHImage(int pos,
+void SelectionList::setAHImage(int pos,
     Image* bild) // sets the selection background image (only with MultiStyled)
 {
     if (ahImageListe) ahImageListe = new RCArray<Image>();
@@ -498,7 +498,7 @@ void AuswahlListe::setAHImage(int pos,
     rend = 1;
 }
 
-void AuswahlListe::setAHFarbe(
+void SelectionList::setAHFarbe(
     int pos, int f) // sets the selection background color
                     // (only with MultiStyled)
 {
@@ -507,7 +507,7 @@ void AuswahlListe::setAHFarbe(
     rend = 1;
 }
 
-void AuswahlListe::setAHImageZ(int pos,
+void SelectionList::setAHImageZ(int pos,
     Image* b) // sets a pointer to the background image (only with MultiStyled)
 {
     if (ahImageListe) ahImageListe = new RCArray<Image>();
@@ -515,7 +515,7 @@ void AuswahlListe::setAHImageZ(int pos,
     rend = 1;
 }
 
-void AuswahlListe::setMsStyle(int pos,
+void SelectionList::setMsStyle(int pos,
     __int64 style) // sets the style of the entry (only with MultiStyled)
 {
     if (!styles) styles = new Array<__int64>();
@@ -523,7 +523,7 @@ void AuswahlListe::setMsStyle(int pos,
     rend = 1;
 }
 
-void AuswahlListe::setMsStyle(int pos, __int64 style, bool add_remove)
+void SelectionList::setMsStyle(int pos, __int64 style, bool add_remove)
 {
     if (!styles) styles = new Array<__int64>();
     if (add_remove)
@@ -533,21 +533,21 @@ void AuswahlListe::setMsStyle(int pos, __int64 style, bool add_remove)
     rend = 1;
 }
 
-void AuswahlListe::addMsStyle(int pos, __int64 style)
+void SelectionList::addMsStyle(int pos, __int64 style)
 {
     if (!styles) styles = new Array<__int64>();
     styles->set(styles->get(pos) | style, pos);
     rend = 1;
 }
 
-void AuswahlListe::removeMsStyle(int pos, __int64 style)
+void SelectionList::removeMsStyle(int pos, __int64 style)
 {
     if (!styles) styles = new Array<__int64>();
     styles->set(styles->get(pos) & ~style, pos);
     rend = 1;
 }
 
-void AuswahlListe::doTastaturEreignis(TastaturEreignis& te)
+void SelectionList::doKeyboardEvent(KeyboardEvent& te)
 {
     bool ntakc = !te.verarbeitet;
     if (hatStyleNicht(Style::Fokus) || !tak || te.verarbeitet) return;
@@ -562,8 +562,8 @@ void AuswahlListe::doTastaturEreignis(TastaturEreignis& te)
                 {
                 case T_Unten:
                     ++auswahl;
-                    if (auswahl > tfListe->getEintragAnzahl())
-                        auswahl = tfListe->getEintragAnzahl();
+                    if (auswahl > tfListe->getEntryCount())
+                        auswahl = tfListe->getEntryCount();
                     rend = 1;
                     break;
                 case T_Oben:
@@ -580,8 +580,8 @@ void AuswahlListe::doTastaturEreignis(TastaturEreignis& te)
                 case T_Unten:
                     deSelect();
                     ++auswahl;
-                    if (auswahl > tfListe->getEintragAnzahl())
-                        auswahl = tfListe->getEintragAnzahl();
+                    if (auswahl > tfListe->getEntryCount())
+                        auswahl = tfListe->getEntryCount();
                     if (auswahl >= 0) addMsStyle(auswahl, Style::Selected);
                     rend = 1;
                     break;
@@ -602,7 +602,7 @@ void AuswahlListe::doTastaturEreignis(TastaturEreignis& te)
     release();
 }
 
-void AuswahlListe::render(Image& zRObj) // draws to zRObj
+void SelectionList::render(Image& zRObj) // draws to zRObj
 {
     if (!DrawableBackground::hatStyle(Style::Sichtbar)) return;
     removeStyle(Style::HScroll);
@@ -639,7 +639,7 @@ void AuswahlListe::render(Image& zRObj) // draws to zRObj
                 selected = hatStyle(style, Style::Selected);
             else
                 selected = auswahl == i;
-            AlphaFeld* tmpBuffer = 0;
+            AlphaField* tmpBuffer = 0;
             bool tmpB = 0;
             int tmpHFarbe = 0;
             bool tmpH = 0;
@@ -655,9 +655,9 @@ void AuswahlListe::render(Image& zRObj) // draws to zRObj
                     if (DrawableBackground::hatStyle(Style::AuswahlBuffer)
                         && aBuffer)
                     {
-                        tmpBuffer = tf->getAlphaFeld();
-                        tf->setAlphaFeldZ(
-                            dynamic_cast<AlphaFeld*>(aBuffer->getThis()));
+                        tmpBuffer = tf->getAlphaField();
+                        tf->setAlphaFieldZ(
+                            dynamic_cast<AlphaField*>(aBuffer->getThis()));
                         tmpB = tf->hatStyle(TextField::Style::Buffered);
                         tf->setStyle(TextField::Style::Buffered,
                             DrawableBackground::hatStyle(
@@ -706,8 +706,8 @@ void AuswahlListe::render(Image& zRObj) // draws to zRObj
                 {
                     if (hatStyle(style, Style::AuswahlBuffer) && aBufferListe)
                     {
-                        tmpBuffer = tf->getAlphaFeld();
-                        tf->setAlphaFeldZ(aBufferListe->get(i));
+                        tmpBuffer = tf->getAlphaField();
+                        tf->setAlphaFieldZ(aBufferListe->get(i));
                         tmpB = tf->hatStyle(TextField::Style::Buffered);
                         tf->setStyle(TextField::Style::Buffered,
                             hatStyle(style, Style::AuswahlBuffer));
@@ -754,7 +754,7 @@ void AuswahlListe::render(Image& zRObj) // draws to zRObj
                 {
                     if (DrawableBackground::hatStyle(Style::AuswahlBuffer))
                     {
-                        tf->setAlphaFeldZ(tmpBuffer);
+                        tf->setAlphaFieldZ(tmpBuffer);
                         tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
                     if (DrawableBackground::hatStyle(
@@ -781,7 +781,7 @@ void AuswahlListe::render(Image& zRObj) // draws to zRObj
                 {
                     if (hatMsStyle(i, Style::AuswahlBuffer) && aBufferListe)
                     {
-                        tf->setAlphaFeldZ(tmpBuffer);
+                        tf->setAlphaFieldZ(tmpBuffer);
                         tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
                     if (hatMsStyle(i, Style::AuswahlHintergrund))
@@ -813,7 +813,7 @@ void AuswahlListe::render(Image& zRObj) // draws to zRObj
     unlockDrawable();
 }
 
-int AuswahlListe::getKlickEintrag(int my)
+int SelectionList::getKlickEintrag(int my)
 {
     if (!tfListe) return -1;
     int y = 0;
@@ -828,43 +828,43 @@ int AuswahlListe::getKlickEintrag(int my)
     return -1;
 }
 
-void AuswahlListe::setAuswahl(int ausw) // sets the selection
+void SelectionList::setAuswahl(int ausw) // sets the selection
 {
     if (hatStyleNicht(Style::MultiSelect))
         auswahl = ausw;
     else if (styles)
     {
-        for (int i = 0; i < styles->getEintragAnzahl(); ++i)
+        for (int i = 0; i < styles->getEntryCount(); ++i)
             removeMsStyle(i, Style::Selected);
         addMsStyle(ausw, Style::Selected);
     }
 }
 
-void AuswahlListe::deSelect()
+void SelectionList::deSelect()
 {
     if (hatStyleNicht(Style::MultiSelect))
         auswahl = -1;
     else if (styles)
     {
-        for (int i = 0; i < styles->getEintragAnzahl(); ++i)
+        for (int i = 0; i < styles->getEntryCount(); ++i)
             removeMsStyle(i, Style::Selected);
     }
 }
 
 // constant
-int AuswahlListe::getEintragAnzahl()
+int SelectionList::getEntryCount()
     const // returns the number of entries
 {
-    return tfListe ? tfListe->getEintragAnzahl() : 0;
+    return tfListe ? tfListe->getEntryCount() : 0;
 }
 
-int AuswahlListe::getAuswahl()
+int SelectionList::getAuswahl()
     const // returns the first selected entry
 {
     return auswahl;
 }
 
-int AuswahlListe::getEintragPos(
+int SelectionList::getEintragPos(
     Text* eintragText) // returns the position of the entry with the
                        // corresponding text
 {
@@ -880,7 +880,7 @@ int AuswahlListe::getEintragPos(
     return -1;
 }
 
-TextField* AuswahlListe::getEintrag(
+TextField* SelectionList::getEintrag(
     int pos) const // returns the entry at position pos
 {
     if (!tfListe) return 0;
@@ -889,55 +889,55 @@ TextField* AuswahlListe::getEintrag(
     return 0;
 }
 
-TextField* AuswahlListe::zEintrag(int pos) const
+TextField* SelectionList::zEintrag(int pos) const
 {
     if (!tfListe) return 0;
     return (TextField*)tfListe->z(pos);
 }
 
-Border* AuswahlListe::getABorder()
+Border* SelectionList::getABorder()
     const // returns the selection border (without MultiStyled)
 {
     if (aBorder) return dynamic_cast<Border*>(aBorder->getThis());
     return 0;
 }
 
-Border* AuswahlListe::zABorder() const
+Border* SelectionList::zABorder() const
 {
     return aBorder;
 }
 
-int AuswahlListe::getAHFarbe()
+int SelectionList::getAHFarbe()
     const // returns the selection background color (without MultiStyled)
 {
     return ahFarbe;
 }
 
-Image* AuswahlListe::getAHImage()
+Image* SelectionList::getAHImage()
     const // returns the selection background image (without MultiStyled)
 {
     if (ahImage) return dynamic_cast<Image*>(ahImage->getThis());
     return 0;
 }
 
-Image* AuswahlListe::zAHImage() const
+Image* SelectionList::zAHImage() const
 {
     return ahImage;
 }
 
-AlphaFeld* AuswahlListe::getABuffer()
+AlphaField* SelectionList::getABuffer()
     const // returns the selection buffer (without MultiStyled)
 {
-    if (aBuffer) return dynamic_cast<AlphaFeld*>(aBuffer->getThis());
+    if (aBuffer) return dynamic_cast<AlphaField*>(aBuffer->getThis());
     return 0;
 }
 
-AlphaFeld* AuswahlListe::zABuffer() const
+AlphaField* SelectionList::zABuffer() const
 {
     return aBuffer;
 }
 
-Border* AuswahlListe::getABorder(
+Border* SelectionList::getABorder(
     int pos) const // returns the selection border (with MultiStyled)
 {
     Border* ret = 0;
@@ -946,21 +946,21 @@ Border* AuswahlListe::getABorder(
     return 0;
 }
 
-Border* AuswahlListe::zABorder(int pos) const
+Border* SelectionList::zABorder(int pos) const
 {
     Border* ret = 0;
     if (aBorderList) ret = (Border*)aBorderList->z(pos);
     return ret;
 }
 
-int AuswahlListe::getAHFarbe(int pos)
+int SelectionList::getAHFarbe(int pos)
     const // returns the selection background color (with MultiStyled)
 {
     if (ahFarbeListe && ahFarbeListe->hat(pos)) return ahFarbeListe->get(pos);
     return 0;
 }
 
-Image* AuswahlListe::getAHImage(
+Image* SelectionList::getAHImage(
     int pos) const // returns the selection background image (with MultiStyled)
 {
     Image* ret = 0;
@@ -969,30 +969,30 @@ Image* AuswahlListe::getAHImage(
     return 0;
 }
 
-Image* AuswahlListe::zAHImage(int pos) const
+Image* SelectionList::zAHImage(int pos) const
 {
     Image* ret = 0;
     if (ahImageListe) ret = (Image*)ahImageListe->z(pos);
     return ret;
 }
 
-AlphaFeld* AuswahlListe::getABuffer(
+AlphaField* SelectionList::getABuffer(
     int pos) const // returns the selection buffer (with MultiStyled)
 {
-    AlphaFeld* ret = 0;
-    if (aBufferListe) ret = (AlphaFeld*)aBufferListe->get(pos);
-    if (ret) return dynamic_cast<AlphaFeld*>(ret->getThis());
+    AlphaField* ret = 0;
+    if (aBufferListe) ret = (AlphaField*)aBufferListe->get(pos);
+    if (ret) return dynamic_cast<AlphaField*>(ret->getThis());
     return 0;
 }
 
-AlphaFeld* AuswahlListe::zABuffer(int pos) const
+AlphaField* SelectionList::zABuffer(int pos) const
 {
-    AlphaFeld* ret = 0;
-    if (aBufferListe) ret = (AlphaFeld*)aBufferListe->z(pos);
+    AlphaField* ret = 0;
+    if (aBufferListe) ret = (AlphaField*)aBufferListe->z(pos);
     return ret;
 }
 
-bool AuswahlListe::hatMsStyle(
+bool SelectionList::hatMsStyle(
     int pos, __int64 style) const // checks if style is present (with MultiStyled)
 {
     __int64 st = 0;
@@ -1000,7 +1000,7 @@ bool AuswahlListe::hatMsStyle(
     return (st | style) == st;
 }
 
-bool AuswahlListe::hatMsStyleNicht(int pos,
+bool SelectionList::hatMsStyleNicht(int pos,
     __int64 style) const // checks if style is not present (with MultiStyled)
 {
     __int64 st = 0;
@@ -1009,7 +1009,7 @@ bool AuswahlListe::hatMsStyleNicht(int pos,
 }
 
 //! Constructor
-ZListe::ZListe()
+DrawableList::DrawableList()
     : DrawableBackground()
 {
     entrySeperatorSize = 1;
@@ -1020,11 +1020,11 @@ ZListe::ZListe()
 }
 
 //! Destructor
-ZListe::~ZListe() {}
+DrawableList::~DrawableList() {}
 
 //! Processes mouse messages
 //! \param me The event triggered by the mouse input
-void ZListe::doMausEreignis(MausEreignis& me, bool userRet)
+void DrawableList::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
     {
@@ -1051,17 +1051,17 @@ void ZListe::doMausEreignis(MausEreignis& me, bool userRet)
     int index = 0;
     for (Drawable* entry : list)
     {
-        entry->doPublicMausEreignis(me);
+        entry->doPublicMouseEvent(me);
         ySum += entry->getHeight();
         me.my -= entry->getHeight();
         if (index < list.getLastIndex())
         {
             ySum
-                += DrawableBackground::hatStyle(ZListe::Style::EntrySeperator)
+                += DrawableBackground::hatStyle(DrawableList::Style::EntrySeperator)
                      ? entrySeperatorSize
                      : 0;
             me.my
-                -= DrawableBackground::hatStyle(ZListe::Style::EntrySeperator)
+                -= DrawableBackground::hatStyle(DrawableList::Style::EntrySeperator)
                      ? entrySeperatorSize
                      : 0;
         }
@@ -1082,7 +1082,7 @@ void ZListe::doMausEreignis(MausEreignis& me, bool userRet)
 
 //! Adds an entry
 //! \param entry The drawing to add
-void ZListe::addEintrag(Drawable* entry)
+void DrawableList::addEintrag(Drawable* entry)
 {
     rend = 1;
     list.add(entry);
@@ -1091,7 +1091,7 @@ void ZListe::addEintrag(Drawable* entry)
 //! Changes an entry
 //! \param pos The index of the entry
 //! \param entry The new drawing
-void ZListe::setEintrag(int pos, Drawable* entry)
+void DrawableList::setEintrag(int pos, Drawable* entry)
 {
     rend = 1;
     list.set(entry, pos);
@@ -1100,20 +1100,20 @@ void ZListe::setEintrag(int pos, Drawable* entry)
 //! Swaps the positions of two entries
 //! \param vpos The index of the first entry
 //! \param npos The index of the second entry
-void ZListe::tauschEintragPos(int vPos, int nPos)
+void DrawableList::tauschEintragPos(int vPos, int nPos)
 {
     rend = 1;
     list.tausch(vPos, nPos);
 }
 
-void Framework::ZListe::setEintragPos(int vpos, int npos)
+void Framework::DrawableList::setEintragPos(int vpos, int npos)
 {
     list.setPosition(vpos, npos);
 }
 
 //! Deletes an entry
 //! pos: The index of the entry
-void ZListe::removeEintrag(int pos)
+void DrawableList::removeEintrag(int pos)
 {
     rend = 1;
     list.remove(pos);
@@ -1121,7 +1121,7 @@ void ZListe::removeEintrag(int pos)
 
 //! Scrolls to a specific entry
 //! \param eintrag The index of the entry
-void ZListe::setVScrollZuEintrag(int eintrag)
+void DrawableList::setVScrollZuEintrag(int eintrag)
 {
     if (vertikalScrollBar)
     {
@@ -1133,7 +1133,7 @@ void ZListe::setVScrollZuEintrag(int eintrag)
             y += entry->getHeight();
             if (index < list.getLastIndex())
                 y += DrawableBackground::hatStyle(
-                         ZListe::Style::EntrySeperator)
+                         DrawableList::Style::EntrySeperator)
                        ? entrySeperatorSize
                        : 0;
             index++;
@@ -1143,7 +1143,7 @@ void ZListe::setVScrollZuEintrag(int eintrag)
 }
 
 //! Updates the maximum scroll height by adding the heights of all entries
-void ZListe::updateVScroll()
+void DrawableList::updateVScroll()
 {
     if (vertikalScrollBar)
     {
@@ -1154,7 +1154,7 @@ void ZListe::updateVScroll()
             y += entry->getHeight();
             if (index < list.getLastIndex())
                 y += DrawableBackground::hatStyle(
-                         ZListe::Style::EntrySeperator)
+                         DrawableList::Style::EntrySeperator)
                        ? entrySeperatorSize
                        : 0;
             index++;
@@ -1170,29 +1170,29 @@ void ZListe::updateVScroll()
 }
 
 //! sets the size of the entry seperator
-void ZListe::setEntrySeperatorSize(int size)
+void DrawableList::setEntrySeperatorSize(int size)
 {
     entrySeperatorSize = size;
 }
 
 //! sets the color of the entry seperator
-void ZListe::setEntrySeperatorColor(int color)
+void DrawableList::setEntrySeperatorColor(int color)
 {
     entrySeperatorColor = color;
 }
 
 //! Processes a keyboard event. Called automatically by the framework
 //! \param te The event
-void ZListe::doTastaturEreignis(TastaturEreignis& te)
+void DrawableList::doKeyboardEvent(KeyboardEvent& te)
 {
     for (Drawable* entry : list)
-        entry->doTastaturEreignis(te);
+        entry->doKeyboardEvent(te);
 }
 
 //! Updates the drawing
 //! \param tickVal The elapsed time in seconds since the last call of this
 //! function \return 1 if the drawing has changed since the last call
-bool ZListe::tick(double tickVal)
+bool DrawableList::tick(double tickVal)
 {
     bool ret = DrawableBackground::tick(tickVal);
     for (Drawable* entry : list)
@@ -1202,7 +1202,7 @@ bool ZListe::tick(double tickVal)
 
 //! Draws the object to zRObj if it is visible
 //! \param zRObj The image to draw into
-void ZListe::render(Image& rObj)
+void DrawableList::render(Image& rObj)
 {
     DrawableBackground::render(rObj);
     int index = 0;
@@ -1221,7 +1221,7 @@ void ZListe::render(Image& rObj)
             rObj.addScrollOffset(0, -entry->getHeight());
             if (index < list.getLastIndex()
                 && DrawableBackground::hatStyle(
-                    ZListe::Style::EntrySeperator))
+                    DrawableList::Style::EntrySeperator))
             {
                 for (int i = 0; i < entrySeperatorSize; i++)
                 {
@@ -1239,7 +1239,7 @@ void ZListe::render(Image& rObj)
 //! Returns the index of an entry the mouse points to
 //! \param my The position of the mouse on the Y axis relative to the top
 //! edge of the list
-int ZListe::getKlickEintrag(int my)
+int DrawableList::getKlickEintrag(int my)
 {
     if (my < 0) return -1;
     int index = 0;
@@ -1249,7 +1249,7 @@ int ZListe::getKlickEintrag(int my)
         if (my < y) return index;
         y += entry->getHeight();
         if (index < list.getLastIndex())
-            y += DrawableBackground::hatStyle(ZListe::Style::EntrySeperator)
+            y += DrawableBackground::hatStyle(DrawableList::Style::EntrySeperator)
                    ? entrySeperatorSize
                    : 0;
         index++;
@@ -1258,14 +1258,14 @@ int ZListe::getKlickEintrag(int my)
 }
 
 //! Returns the number of entries
-int ZListe::getEintragAnzahl() const
+int DrawableList::getEntryCount() const
 {
-    return list.getEintragAnzahl();
+    return list.getEntryCount();
 }
 
 //! Returns the index of an entry
 //! \param zEntry The drawing
-int ZListe::getEintragPos(Drawable* zEntry)
+int DrawableList::getEintragPos(Drawable* zEntry)
 {
     int index = 0;
     for (Drawable* entry : list)
@@ -1278,20 +1278,20 @@ int ZListe::getEintragPos(Drawable* zEntry)
 
 //! Returns an entry
 //! \param pos The index of the entry
-Drawable* ZListe::getEintrag(int pos) const
+Drawable* DrawableList::getEintrag(int pos) const
 {
     return list.get(pos);
 }
 
 //! Returns an entry without increased reference counter
 //! \param pos The index of the entry
-Drawable* ZListe::zEintrag(int pos) const
+Drawable* DrawableList::zEintrag(int pos) const
 {
     return list.get(pos);
 }
 
 //! Returns the needed height
-int ZListe::getNeededHeight() const
+int DrawableList::getNeededHeight() const
 {
     int y = (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
               ? rahmen->getRBreite() * 2
@@ -1301,7 +1301,7 @@ int ZListe::getNeededHeight() const
     {
         y += entry->getHeight();
         if (index < list.getLastIndex())
-            y += DrawableBackground::hatStyle(ZListe::Style::EntrySeperator)
+            y += DrawableBackground::hatStyle(DrawableList::Style::EntrySeperator)
                    ? entrySeperatorSize
                    : 0;
         index++;
@@ -1310,13 +1310,13 @@ int ZListe::getNeededHeight() const
 }
 
 //! returns the size of the entry seperator
-int ZListe::getEntrySeperatorSize() const
+int DrawableList::getEntrySeperatorSize() const
 {
     return entrySeperatorSize;
 }
 
 //! returns the color of the entry seperator
-int ZListe::getEntrySeperatorColor() const
+int DrawableList::getEntrySeperatorColor() const
 {
     return entrySeperatorColor;
 }

List.h

@@ -7,19 +7,19 @@
 namespace Framework
 {
     class Border;            //! Border.h
-    class AlphaFeld;         //! AlphaField.h
+    class AlphaField;         //! AlphaField.h
     class Image;              //! Image.h
     class Text;              //! Text.h
     class TextField;          //! TextField.h
     class VScrollBar;        //! Scroll.h
-    struct TastaturEreignis; //! KeyboardEvent.h
-    struct MausEreignis;     //! MouseEvent.h
+    struct KeyboardEvent; //! KeyboardEvent.h
+    struct MouseEvent;     //! MouseEvent.h
     class Font;           //! Font.h
-    class AuswahlListe;      //! from this file
+    class SelectionList;      //! from this file
 
     //! A drawing of the 2D GUI Framework that displays a list from which
     //! the user can select and deselect elements
-    class AuswahlListe : public DrawableBackground
+    class SelectionList : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -68,24 +68,24 @@ namespace Framework
         int auswahl;
         int ahFarbe;
         Image* ahImage;
-        AlphaFeld* aBuffer;
+        AlphaField* aBuffer;
         Border* aBorder;
         Array<__int64>* styles;
         Array<int>* ahFarbeListe;
         RCArray<Image>* ahImageListe;
-        RCArray<AlphaFeld>* aBufferListe;
+        RCArray<AlphaField>* aBufferListe;
         RCArray<Border>* aBorderList;
         Font* schrift;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
         DLLEXPORT bool hatStyle(int styleSet, int styleCheck) const;
 
     public:
         //! Constructor
-        DLLEXPORT AuswahlListe();
+        DLLEXPORT SelectionList();
         //! Destructor
-        DLLEXPORT virtual ~AuswahlListe();
+        DLLEXPORT virtual ~SelectionList();
         //! Updates the styles, size and position of the entries
         DLLEXPORT void update();
         //! Adds an entry
@@ -151,7 +151,7 @@ namespace Framework
         DLLEXPORT void setALRFarbe(int fc);
         //! Sets a pointer to the color gradient used for selected entries
         //! if MultiStyled is not set \param buffer The color gradient
-        DLLEXPORT void setAAFZ(AlphaFeld* buffer);
+        DLLEXPORT void setAAFZ(AlphaField* buffer);
         //! Sets the strength of the color gradient used for selected entries
         //! if MultiStyled is not set \param st The strength
         DLLEXPORT void setAAFStrength(int st);
@@ -182,7 +182,7 @@ namespace Framework
         //! Sets a pointer to the color gradient used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param buffer The color gradient
-        DLLEXPORT void setAAFZ(int pos, AlphaFeld* buffer);
+        DLLEXPORT void setAAFZ(int pos, AlphaField* buffer);
         //! Sets the strength of the color gradient used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param st The strength
@@ -225,7 +225,7 @@ namespace Framework
         DLLEXPORT void removeMsStyle(int pos, __int64 style);
         //! Processes a keyboard event. Called automatically by the framework
         //! \param te The event
-        DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
+        DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
@@ -239,11 +239,11 @@ namespace Framework
         //! Deselects all selected entries
         DLLEXPORT void deSelect();
         //! Returns the number of entries
-        DLLEXPORT int getEintragAnzahl() const;
+        DLLEXPORT int getEntryCount() const;
         //! Returns the index of the selected entry if MultiSelect is not
         //! set. If MultiSelect is set, the selection of an entry can be
         //! checked with hatMsStyle( entry index,
-        //! AuswahlListe::Style::Ausgewaehlt )
+        //! SelectionList::Style::Ausgewaehlt )
         DLLEXPORT int getAuswahl() const;
         //! Returns the index of an entry
         //! \param eintragText The text of the entry
@@ -271,10 +271,10 @@ namespace Framework
         DLLEXPORT Image* zAHImage() const;
         //! Returns the color gradient used for selected entries
         //! if MultiStyled is not set
-        DLLEXPORT AlphaFeld* getABuffer() const;
+        DLLEXPORT AlphaField* getABuffer() const;
         //! Returns the color gradient without increased reference counter
         //! used for selected entries if MultiStyled is not set
-        DLLEXPORT AlphaFeld* zABuffer() const;
+        DLLEXPORT AlphaField* zABuffer() const;
         //! Returns the border used for a selected entry
         //! if MultiStyled is set
         DLLEXPORT Border* getABorder(int pos) const;
@@ -292,10 +292,10 @@ namespace Framework
         DLLEXPORT Image* zAHImage(int pos) const;
         //! Returns the color gradient used for a selected entry
         //! if MultiStyled is set
-        DLLEXPORT AlphaFeld* getABuffer(int pos) const;
+        DLLEXPORT AlphaField* getABuffer(int pos) const;
         //! Returns the color gradient without increased reference counter
         //! used for a selected entry if MultiStyled is set
-        DLLEXPORT AlphaFeld* zABuffer(int pos) const;
+        DLLEXPORT AlphaField* zABuffer(int pos) const;
         //! Checks whether specific styles are set for a specific entry
         //! if MultiStyled is set. Also checks whether an entry is selected
         //! if MultiSelect is set \param pos The index of the entry
@@ -309,7 +309,7 @@ namespace Framework
         DLLEXPORT inline bool hatMsStyleNicht(int pos, __int64 style) const;
     };
 
-    class ZListe : public DrawableBackground
+    class DrawableList : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -331,13 +331,13 @@ namespace Framework
     protected:
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
-        DLLEXPORT ZListe();
+        DLLEXPORT DrawableList();
         //! Destructor
-        DLLEXPORT virtual ~ZListe();
+        DLLEXPORT virtual ~DrawableList();
         //! Adds an entry
         //! \param entry The drawing to add
         DLLEXPORT void addEintrag(Drawable* entry);
@@ -367,7 +367,7 @@ namespace Framework
         DLLEXPORT void setEntrySeperatorColor(int color);
         //! Processes a keyboard event. Called automatically by the framework
         //! \param te The event
-        DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
+        DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
         //! Updates the drawing
         //! \param tickVal The elapsed time in seconds since the last
         //! call of this function \return 1 if the drawing has changed
@@ -381,7 +381,7 @@ namespace Framework
         //! the top edge of the list
         DLLEXPORT int getKlickEintrag(int my);
         //! Returns the number of entries
-        DLLEXPORT int getEintragAnzahl() const;
+        DLLEXPORT int getEntryCount() const;
         //! Returns the index of an entry
         //! \param zEntry The drawing
         DLLEXPORT int getEintragPos(Drawable* zEntry);

Logging.cpp

@@ -120,8 +120,8 @@ public:
         LogLevel level,
         const std::source_location& location) const override
     {
-        Zeit* z = getZeit();
-        Text* time = z->getZeit(format);
+        Time* z = getTime();
+        Text* time = z->getTime(format);
         Text result;
         if (postBlank)
         {
@@ -596,10 +596,10 @@ void Framework::Logging::ConsoleHandlerLoggingChannel::writeMessage(
 }
 
 Framework::Logging::FileLoggingChannel::FileLoggingChannel(Text filePath)
-    : FileLoggingChannel(new Datei(filePath))
+    : FileLoggingChannel(new File(filePath))
 {}
 
-Framework::Logging::FileLoggingChannel::FileLoggingChannel(Datei* file)
+Framework::Logging::FileLoggingChannel::FileLoggingChannel(File* file)
     : LoggingChannel(),
       file(file)
 {
@@ -610,7 +610,7 @@ Framework::Logging::FileLoggingChannel::FileLoggingChannel(Datei* file)
     if (!file->istOffen())
     {
         file->open(
-            Datei::Style::schreiben | Datei::Style::ende | Datei::Style::lesen);
+            File::Style::schreiben | File::Style::ende | File::Style::lesen);
     }
 }
 

Logging.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <functional>
 #include <source_location>
@@ -9,7 +9,7 @@
 
 namespace Framework
 {
-    class Datei;
+    class File;
 
     namespace Logging
     {
@@ -342,7 +342,7 @@ namespace Framework
         class FileLoggingChannel : public LoggingChannel
         {
         private:
-            Datei* file;
+            File* file;
 
         public:
             /**
@@ -352,7 +352,7 @@ namespace Framework
              * the messages will be appended to the file.
              */
             DLLEXPORT FileLoggingChannel(Text filePath);
-            DLLEXPORT FileLoggingChannel(Datei* file);
+            DLLEXPORT FileLoggingChannel(File* file);
             DLLEXPORT ~FileLoggingChannel();
 
         protected:

M2DPreview.cpp

@@ -10,9 +10,9 @@
 
 using namespace Framework;
 
-// Contents of the M2DVorschau class from M2DPreview.h
+// Contents of the M2DPreview class from M2DPreview.h
 // Constructor
-M2DVorschau::M2DVorschau()
+M2DPreview::M2DPreview()
     : DrawableBackground()
 {
     mdl = 0;
@@ -23,14 +23,14 @@ M2DVorschau::M2DVorschau()
 }
 
 // Destructor
-M2DVorschau::~M2DVorschau()
+M2DPreview::~M2DPreview()
 {
     if (mdl) mdl->release();
     if (ram) ram->release();
     if (af) af->release();
 }
 
-void M2DVorschau::doMausEreignis(MausEreignis& me, bool userRet)
+void M2DPreview::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (hatStyleNicht(Style::Erlaubt) || !userRet) return;
     if (hatStyle(Style::UsrScale))
@@ -74,21 +74,21 @@ void M2DVorschau::doMausEreignis(MausEreignis& me, bool userRet)
 }
 
 // non-constant
-void M2DVorschau::setModel2DZ(Model2D* mdl)
+void M2DPreview::setModel2DZ(Model2D* mdl)
 {
     if (this->mdl) this->mdl->release();
     this->mdl = mdl;
     rend = 1;
 }
 
-void M2DVorschau::setModel2D(Model2DData* mdl)
+void M2DPreview::setModel2D(Model2DData* mdl)
 {
     if (!this->mdl) this->mdl = new Model2D();
     this->mdl->setModel(mdl);
     rend = 1;
 }
 
-bool M2DVorschau::tick(double tv)
+bool M2DPreview::tick(double tv)
 {
     rend |= mdl ? mdl->tick(tv) : 0;
     rend |= af ? af->tick(tv) : 0;
@@ -96,7 +96,7 @@ bool M2DVorschau::tick(double tv)
     return DrawableBackground::tick(tv);
 }
 
-void M2DVorschau::render(Image& rb)
+void M2DPreview::render(Image& rb)
 {
     removeStyle(Style::VScroll | Style::HScroll);
     if (hatStyleNicht(Style::Sichtbar)) return;
@@ -112,23 +112,23 @@ void M2DVorschau::render(Image& rb)
 }
 
 // constant
-Model2D* M2DVorschau::zModel() const
+Model2D* M2DPreview::zModel() const
 {
     return mdl;
 }
 
-Model2D* M2DVorschau::getModel() const
+Model2D* M2DPreview::getModel() const
 {
     return mdl ? dynamic_cast<Model2D*>(mdl->getThis()) : 0;
 }
 
-Drawable* M2DVorschau::dublizieren() const
+Drawable* M2DPreview::dublizieren() const
 {
-    M2DVorschau* ret = new M2DVorschau();
+    M2DPreview* ret = new M2DPreview();
     if (mdl) ret->setModel2D(mdl->getModel());
     if (rahmen) ret->setBorderZ((Border*)rahmen->dublizieren());
     if (hintergrundFeld)
-        ret->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
+        ret->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
     ret->setHintergrundFarbe(bgF);
     return ret;
 }

M2DPreview.h

@@ -7,11 +7,11 @@ namespace Framework
     class Model2D;       //! Model2D.h
     class Model2DData;   //! Model2D.h
     class Border;        //! Border.h
-    class AlphaFeld;     //! AlphaField.h
-    struct MausEreignis; //! MouseEvent.h
+    class AlphaField;     //! AlphaField.h
+    struct MouseEvent; //! MouseEvent.h
 
     //! A 2D GUI framework drawing that displays a 2D model
-    class M2DVorschau : public DrawableBackground
+    class M2DPreview : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -31,19 +31,19 @@ namespace Framework
     private:
         Model2D* mdl;
         Border* ram;
-        AlphaFeld* af;
+        AlphaField* af;
         int bgF;
         int mx;
         int my;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
-        DLLEXPORT M2DVorschau();
+        DLLEXPORT M2DPreview();
         //! Destructor
-        DLLEXPORT virtual ~M2DVorschau();
+        DLLEXPORT virtual ~M2DPreview();
         //! Sets a pointer to the model to display
         //! \param mdl The model
         DLLEXPORT void setModel2DZ(Model2D* mdl);

M2File.cpp

@@ -6,9 +6,9 @@
 
 using namespace Framework;
 
-// Contents of the M2Datei class from M2File.h
+// Contents of the M2File class from M2File.h
 // Constructor
-M2Datei::M2Datei()
+M2File::M2File()
     : ReferenceCounter()
 {
     pfad = new Text();
@@ -16,7 +16,7 @@ M2Datei::M2Datei()
     modelPos = new Array<__int64>();
 }
 
-M2Datei::M2Datei(const char* pfad)
+M2File::M2File(const char* pfad)
     : ReferenceCounter()
 {
     this->pfad = new Text(pfad);
@@ -24,7 +24,7 @@ M2Datei::M2Datei(const char* pfad)
     modelPos = new Array<__int64>();
 }
 
-M2Datei::M2Datei(Text* pfad)
+M2File::M2File(Text* pfad)
     : ReferenceCounter()
 {
     this->pfad = pfad;
@@ -33,7 +33,7 @@ M2Datei::M2Datei(Text* pfad)
 }
 
 // Destructor
-M2Datei::~M2Datei()
+M2File::~M2File()
 {
     pfad->release();
     modelName->release();
@@ -41,22 +41,22 @@ M2Datei::~M2Datei()
 }
 
 // non-constant
-void M2Datei::setPfad(const char* pfad)
+void M2File::setPfad(const char* pfad)
 {
     this->pfad->setText(pfad);
 }
 
-void M2Datei::setPfadZ(Text* pfad)
+void M2File::setPfadZ(Text* pfad)
 {
     if (this->pfad) this->pfad->release();
     this->pfad = pfad;
 }
 
-void M2Datei::leseDaten()
+void M2File::leseDaten()
 {
-    Datei d;
-    d.setDatei(pfad->getText());
-    d.open(Datei::Style::lesen);
+    File d;
+    d.setFile(pfad->getText());
+    d.open(File::Style::lesen);
     char anz = 0;
     d.lese(&anz, 1);
     modelName->leeren();
@@ -77,16 +77,16 @@ void M2Datei::leseDaten()
     d.close();
 }
 
-bool M2Datei::saveModel(Model2DData* zMdr, Text* name)
+bool M2File::saveModel(Model2DData* zMdr, Text* name)
 {
     bool ret = saveModel(zMdr, name->getText());
     name->release();
     return ret;
 }
 
-bool M2Datei::saveModel(Model2DData* zMdr, const char* name)
+bool M2File::saveModel(Model2DData* zMdr, const char* name)
 {
-    int anz = modelName->getEintragAnzahl();
+    int anz = modelName->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
         if (modelName->z(i)->istGleich(name))
@@ -95,16 +95,16 @@ bool M2Datei::saveModel(Model2DData* zMdr, const char* name)
             break;
         }
     }
-    anz = modelName->getEintragAnzahl();
-    Datei d;
-    d.setDatei(pfad->getText());
-    d.open(Datei::Style::lesen);
-    Datei neu;
-    neu.setDatei(pfad->getText());
+    anz = modelName->getEntryCount();
+    File d;
+    d.setFile(pfad->getText());
+    d.open(File::Style::lesen);
+    File neu;
+    neu.setFile(pfad->getText());
     neu.zPfad()->append("0");
     while (neu.existiert())
         neu.zPfad()->append("0");
-    if (!neu.open(Datei::Style::schreiben))
+    if (!neu.open(File::Style::schreiben))
     {
         if (d.istOffen()) d.close();
         return 0;
@@ -142,12 +142,12 @@ bool M2Datei::saveModel(Model2DData* zMdr, const char* name)
         }
     }
     d.close();
-    char pAnz = (char)zMdr->polygons->getEintragAnzahl();
+    char pAnz = (char)zMdr->polygons->getEntryCount();
     neu.schreibe(&pAnz, 1);
     for (int p = 0; p < pAnz; p++)
     {
         char pNameL = (char)zMdr->polygons->get(p).name->getLength();
-        int vAnz = zMdr->polygons->get(p).vertex->getEintragAnzahl();
+        int vAnz = zMdr->polygons->get(p).vertex->getEntryCount();
         char options = 1;
         for (int i = 0; i < vAnz; i++)
             options
@@ -184,16 +184,16 @@ bool M2Datei::saveModel(Model2DData* zMdr, const char* name)
     return 1;
 }
 
-bool M2Datei::removeModel(Text* name)
+bool M2File::removeModel(Text* name)
 {
     bool ret = removeModel(name->getText());
     name->release();
     return ret;
 }
 
-bool M2Datei::removeModel(const char* name)
+bool M2File::removeModel(const char* name)
 {
-    int anz = modelName->getEintragAnzahl();
+    int anz = modelName->getEntryCount();
     int p = -1;
     for (int i = 0; i < anz; i++)
     {
@@ -204,15 +204,15 @@ bool M2Datei::removeModel(const char* name)
         }
     }
     if (p < 0) return 0;
-    Datei d;
-    d.setDatei(pfad->getText());
-    if (!d.open(Datei::Style::lesen)) return 0;
-    Datei neu;
-    neu.setDatei(pfad->getText());
+    File d;
+    d.setFile(pfad->getText());
+    if (!d.open(File::Style::lesen)) return 0;
+    File neu;
+    neu.setFile(pfad->getText());
     neu.zPfad()->append("0");
     while (neu.existiert())
         neu.zPfad()->append("0");
-    if (!neu.open(Datei::Style::schreiben))
+    if (!neu.open(File::Style::schreiben))
     {
         if (d.istOffen()) d.close();
         return 0;
@@ -275,19 +275,19 @@ bool M2Datei::removeModel(const char* name)
 }
 
 // constant
-Model2DData* M2Datei::ladeModel(Text* name) const
+Model2DData* M2File::ladeModel(Text* name) const
 {
     Model2DData* ret = ladeModel(name->getText());
     name->release();
     return ret;
 }
 
-Model2DData* M2Datei::ladeModel(const char* name) const
+Model2DData* M2File::ladeModel(const char* name) const
 {
-    Datei d;
-    d.setDatei(pfad->getText());
-    if (!d.open(Datei::Style::lesen)) return 0;
-    int anz = modelName->getEintragAnzahl();
+    File d;
+    d.setFile(pfad->getText());
+    if (!d.open(File::Style::lesen)) return 0;
+    int anz = modelName->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
         if (modelName->z(i)->istGleich(name))
@@ -358,9 +358,9 @@ Model2DData* M2Datei::ladeModel(const char* name) const
     return ret;
 }
 
-bool M2Datei::hatModel(const char* name) const
+bool M2File::hatModel(const char* name) const
 {
-    int anz = modelName->getEintragAnzahl();
+    int anz = modelName->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
         if (modelName->z(i)->istGleich(name)) return 1;
@@ -368,12 +368,12 @@ bool M2Datei::hatModel(const char* name) const
     return 0;
 }
 
-int M2Datei::getModelAnzahl() const
+int M2File::getModelAnzahl() const
 {
-    return modelName->getEintragAnzahl();
+    return modelName->getEntryCount();
 }
 
-Text* M2Datei::zModelName(int i) const
+Text* M2File::zModelName(int i) const
 {
     return modelName->z(i);
 }

M2File.h

@@ -1,5 +1,5 @@
-#ifndef M2Datei_H
-#define M2Datei_H
+#ifndef M2File_H
+#define M2File_H
 
 #include "Array.h"
 
@@ -10,7 +10,7 @@ namespace Framework
 
     //! This class manages the framework's own file format for 2D model data.
     //! Multiple 2D model data can be stored in one file.
-    class M2Datei : public virtual ReferenceCounter
+    class M2File : public virtual ReferenceCounter
     {
     private:
         Text* pfad;
@@ -19,15 +19,15 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT M2Datei();
+        DLLEXPORT M2File();
         //! Constructor
         //! \param pfad The path to the file
-        DLLEXPORT M2Datei(const char* pfad);
+        DLLEXPORT M2File(const char* pfad);
         //! Constructor
         //! \param pfad The path to the file
-        DLLEXPORT M2Datei(Text* pfad);
+        DLLEXPORT M2File(Text* pfad);
         //! Destructor
-        DLLEXPORT ~M2Datei();
+        DLLEXPORT ~M2File();
         //! Sets the path to the file
         //! \param pfad Path to the file
         DLLEXPORT void setPfad(const char* pfad);

M3File.cpp

@@ -6,9 +6,9 @@
 
 using namespace Framework;
 
-// Content of the M3Datei class from M3File.h
+// Content of the M3File class from M3File.h
 // Constructor
-M3Datei::M3Datei()
+M3File::M3File()
     : ReferenceCounter()
 {
     modelName = 0;
@@ -17,28 +17,28 @@ M3Datei::M3Datei()
 
 // Constructor
 //  pfad: the path to the file
-M3Datei::M3Datei(const char* pfad)
-    : M3Datei()
+M3File::M3File(const char* pfad)
+    : M3File()
 {
     this->pfad = pfad;
 }
 
 // Constructor
 //  pfad: the path to the file
-M3Datei::M3Datei(Text* pfad)
-    : M3Datei(pfad->getText())
+M3File::M3File(Text* pfad)
+    : M3File(pfad->getText())
 {
     pfad->release();
 }
 
 // Destructor
-M3Datei::~M3Datei()
+M3File::~M3File()
 {
     if (modelName) modelName->release();
     if (modelPos) modelPos->release();
 }
 
-void M3Datei::saveKnochen(Bone* k, Datei* zDat)
+void M3File::saveKnochen(Bone* k, File* zDat)
 {
     bool c = k != 0;
     zDat->schreibe((char*)&c, 1);
@@ -63,7 +63,7 @@ void M3Datei::saveKnochen(Bone* k, Datei* zDat)
     }
 }
 
-Bone* Framework::M3Datei::readKnochen(Datei* zDat) const
+Bone* Framework::M3File::readKnochen(File* zDat) const
 {
     bool c;
     zDat->lese((char*)&c, 1);
@@ -91,7 +91,7 @@ Bone* Framework::M3Datei::readKnochen(Datei* zDat) const
 
 // sets the path to the file
 // pfad: the path
-void M3Datei::setPfad(const char* pfad)
+void M3File::setPfad(const char* pfad)
 {
     this->pfad = pfad;
     if (modelName) modelName = (RCArray<Text>*)modelName->release();
@@ -99,15 +99,15 @@ void M3Datei::setPfad(const char* pfad)
 }
 
 // reads header information from the file needed for its usage.
-void M3Datei::leseDaten()
+void M3File::leseDaten()
 {
     if (modelName) modelName = (RCArray<Text>*)modelName->release();
     if (modelPos) modelPos = (Array<__int64>*)modelPos->release();
     modelName = new RCArray<Text>();
     modelPos = new Array<__int64>();
-    Datei d;
-    d.setDatei(pfad);
-    if (!d.open(Datei::Style::lesen)) return;
+    File d;
+    d.setFile(pfad);
+    if (!d.open(File::Style::lesen)) return;
     unsigned char anz = 0;
     d.lese((char*)&anz, 1);
     for (int i = 0; i < anz; i++)
@@ -131,7 +131,7 @@ void M3Datei::leseDaten()
 //  counter name: The name under which the data is stored in the file
 //  return: 1 if the model was saved. 0 if an error
 //  occurred during saving
-bool M3Datei::saveModel(Model3DData* zMdr, Text* name)
+bool M3File::saveModel(Model3DData* zMdr, Text* name)
 {
     bool ret = saveModel(zMdr, name->getText());
     name->release();
@@ -143,21 +143,21 @@ bool M3Datei::saveModel(Model3DData* zMdr, Text* name)
 //  counter name: The name under which the data is stored in the file
 //  return: 1 if the model was saved. 0 if an error
 //  occurred during saving
-bool M3Datei::saveModel(Model3DData* zMdr, const char* name)
+bool M3File::saveModel(Model3DData* zMdr, const char* name)
 {
     if (!modelName || !pfad.getLength()) return 0;
     if (hatModel(name) && !removeModel(name)) return 0;
-    int anz = modelName->getEintragAnzahl();
-    anz = modelName->getEintragAnzahl();
-    Datei d;
-    d.setDatei(pfad);
-    d.open(Datei::Style::lesen);
-    Datei neu;
-    neu.setDatei(pfad);
+    int anz = modelName->getEntryCount();
+    anz = modelName->getEntryCount();
+    File d;
+    d.setFile(pfad);
+    d.open(File::Style::lesen);
+    File neu;
+    neu.setFile(pfad);
     neu.zPfad()->append("0");
     while (neu.existiert())
         neu.zPfad()->append("0");
-    if (!neu.open(Datei::Style::schreiben))
+    if (!neu.open(File::Style::schreiben))
     {
         if (d.istOffen()) d.close();
         return 0;
@@ -246,7 +246,7 @@ bool M3Datei::saveModel(Model3DData* zMdr, const char* name)
 //  name: The name of the model
 //  return: 1 if the model was deleted. 0 if the model was not found
 //  or an error occurred during saving
-bool M3Datei::removeModel(Text* name)
+bool M3File::removeModel(Text* name)
 {
     bool res = removeModel(name->getText());
     name->release();
@@ -257,25 +257,25 @@ bool M3Datei::removeModel(Text* name)
 //  name: The name of the model
 //  return: 1 if the model was deleted. 0 if the model was not found
 //  or an error occurred during saving
-bool M3Datei::removeModel(const char* name)
+bool M3File::removeModel(const char* name)
 {
     if (!modelName || !pfad.getLength()) return 0;
     if (!hatModel(name)) return 0;
-    Datei d;
-    d.setDatei(pfad);
-    if (!d.open(Datei::Style::lesen)) return 0;
+    File d;
+    d.setFile(pfad);
+    if (!d.open(File::Style::lesen)) return 0;
     __int64 startPosition = modelPos->get(0);
-    Datei neu;
-    neu.setDatei(pfad);
+    File neu;
+    neu.setFile(pfad);
     neu.zPfad()->append("0");
     while (neu.existiert())
         neu.zPfad()->append("0");
-    if (!neu.open(Datei::Style::schreiben))
+    if (!neu.open(File::Style::schreiben))
     {
         d.close();
         return 0;
     }
-    char anz = (char)(modelName->getEintragAnzahl() - 1);
+    char anz = (char)(modelName->getEntryCount() - 1);
     neu.schreibe(&anz, 1);
     __int64 offset = textLength(name) + 9;
     __int64 removedLength = 0;
@@ -296,7 +296,7 @@ bool M3Datei::removeModel(const char* name)
         {
             removedPosition = modelPos->get(i);
             removedIndex = i;
-            if (modelName->getEintragAnzahl() > i + 1)
+            if (modelName->getEntryCount() > i + 1)
             {
                 removedLength = modelPos->get(i + 1) - modelPos->get(i);
                 offset += removedLength;
@@ -338,7 +338,7 @@ bool M3Datei::removeModel(const char* name)
 // Loads a 3D model from the file
 //  name: The name of the model to load
 //  return: The loaded data
-Model3DData* M3Datei::ladeModel(
+Model3DData* M3File::ladeModel(
     Text* name, GraphicsApi* zApi, Text* uniqueName) const
 {
     Model3DData* d = ladeModel(name->getText(), zApi, uniqueName->getText());
@@ -350,7 +350,7 @@ Model3DData* M3Datei::ladeModel(
 // Loads a 3D model from the file
 //  name: The name of the model to load
 //  return: The loaded data
-Model3DData* M3Datei::ladeModel(
+Model3DData* M3File::ladeModel(
     const char* name, GraphicsApi* zApi, const char* uniqueName) const
 {
     if (!modelName || !pfad.getLength()) return 0;
@@ -366,9 +366,9 @@ Model3DData* M3Datei::ladeModel(
     }
     if (pos > 0)
     {
-        Datei d;
-        d.setDatei(pfad);
-        if (!d.open(Datei::Style::lesen))
+        File d;
+        d.setFile(pfad);
+        if (!d.open(File::Style::lesen))
         {
             return 0;
         }
@@ -433,7 +433,7 @@ Model3DData* M3Datei::ladeModel(
 // Checks whether a specific 3D model exists in the file
 //  name: The name of the 3D model to search for
 //  return: 1 if the model was found. 0 otherwise
-bool M3Datei::hatModel(const char* name) const
+bool M3File::hatModel(const char* name) const
 {
     if (!modelName || !pfad.getLength()) return 0;
     for (auto n = modelName->begin(); n; n++)
@@ -444,17 +444,17 @@ bool M3Datei::hatModel(const char* name) const
 }
 
 // Returns the number of stored models
-int M3Datei::getModelAnzahl() const
+int M3File::getModelAnzahl() const
 {
     if (!modelName || !pfad.getLength()) return 0;
-    return modelName->getEintragAnzahl();
+    return modelName->getEntryCount();
 }
 
 // Returns the name of a specific model
 //  i: The index of the model
 //  return: A pointer to the name of the model without increased reference
 //  counter
-Text* M3Datei::zModelName(int i) const
+Text* M3File::zModelName(int i) const
 {
     if (!modelName || !pfad.getLength()) return 0;
     return modelName->z(i);

M3File.h

@@ -8,31 +8,31 @@ namespace Framework
     class Text;
     class Model3DData;
     class Bone;
-    class Datei;
+    class File;
     class GraphicsApi;
 
     //! Manages a file in which 3D models are stored
-    class M3Datei : public virtual ReferenceCounter
+    class M3File : public virtual ReferenceCounter
     {
     private:
         Text pfad;
         RCArray<Text>* modelName;
         Array<__int64>* modelPos;
 
-        void saveKnochen(Bone* k, Datei* zDat);
-        Bone* readKnochen(Datei* zDat) const;
+        void saveKnochen(Bone* k, File* zDat);
+        Bone* readKnochen(File* zDat) const;
 
     public:
         //! Constructor
-        DLLEXPORT M3Datei();
+        DLLEXPORT M3File();
         //! Constructor
         //! \param pfad The path to the file
-        DLLEXPORT M3Datei(const char* pfad);
+        DLLEXPORT M3File(const char* pfad);
         //! Constructor
         //! \param pfad The path to the file
-        DLLEXPORT M3Datei(Text* pfad);
+        DLLEXPORT M3File(Text* pfad);
         //! Destructor
-        DLLEXPORT ~M3Datei();
+        DLLEXPORT ~M3File();
         //! Sets the path to the file
         //! \param pfad Path to the file
         DLLEXPORT void setPfad(const char* pfad);

Model2D.cpp

@@ -23,7 +23,7 @@ Model2DData::~Model2DData()
 {
     if (polygons)
     {
-        int anz = polygons->getEintragAnzahl();
+        int anz = polygons->getEntryCount();
         for (int i = 0; i < anz; i++)
         {
             if (polygons->get(i).name) polygons->get(i).name->release();
@@ -48,7 +48,7 @@ bool Model2DData::istPunktInnen(Vertex p, int polygonId) const
         polygon++, num++, outListP++)
     {
         if (polygonId >= 0 && num != polygonId) continue;
-        int anz = polygon._.vertex->getEintragAnzahl();
+        int anz = polygon._.vertex->getEntryCount();
         bool c = 0;
         int j = anz - 1;
         for (auto outListPP = outListP->begin(); outListPP; outListPP++)
@@ -84,12 +84,12 @@ bool Model2DData::istPunktInnen(Vertex p, int polygonId) const
 bool Model2DData::istLinieInnen(Vertex a, Vertex b, int polygonId) const
 {
     if (!polygons) return 0;
-    int pAnz = polygons->getEintragAnzahl();
+    int pAnz = polygons->getEntryCount();
     for (int p = 0; p < pAnz; p++)
     {
         if (polygonId >= 0 && p != polygonId) continue;
-        int ola = outList.z(p)->getEintragAnzahl();
-        int anz = polygons->get(p).vertex->getEintragAnzahl();
+        int ola = outList.z(p)->getEntryCount();
+        int anz = polygons->get(p).vertex->getEntryCount();
         int j = anz - 1;
         for (int k = 0; k < ola; k++)
         {
@@ -141,22 +141,22 @@ bool Model2DData::istLinieInnen(Vertex a, Vertex b, int polygonId) const
 bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
 {
     removeModell();
-    if (!polygons || !polygons->getEintragAnzahl())
+    if (!polygons || !polygons->getEntryCount())
     {
         this->polygons = polygons;
-        vListen = new RCArray<RCArray<DreieckListe<Vertex>>>();
+        vListen = new RCArray<RCArray<TriangleList<Vertex>>>();
         return 1;
     }
     this->polygons = polygons;
-    int pAnz = polygons->getEintragAnzahl();
-    vListen = new RCArray<RCArray<DreieckListe<Vertex>>>();
+    int pAnz = polygons->getEntryCount();
+    vListen = new RCArray<RCArray<TriangleList<Vertex>>>();
     for (int p = 0; p < pAnz; p++)
     {
         Polygon2D pg = polygons->get(p);
-        if (!pg.vertex || pg.vertex->getEintragAnzahl() < 3) continue;
-        vListen->add(new RCArray<DreieckListe<Vertex>>());
+        if (!pg.vertex || pg.vertex->getEntryCount() < 3) continue;
+        vListen->add(new RCArray<TriangleList<Vertex>>());
         outList.add(new Array<Punkt>);
-        int vAnz = pg.vertex->getEintragAnzahl();
+        int vAnz = pg.vertex->getEntryCount();
         bool textur = pg.tKordinaten != 0;
         for (int i = 0; i < vAnz && textur; i++)
             textur &= pg.tKordinaten->hat(i);
@@ -178,11 +178,11 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
         {
             if (pg.tKordinaten) pg.tKordinaten->leeren();
         }
-        RCArray<RCArray<DreieckListe<Vertex>>> lists;
+        RCArray<RCArray<TriangleList<Vertex>>> lists;
         int lauf = 0;
         while (1)
         {
-            lists.add(new RCArray<DreieckListe<Vertex>>());
+            lists.add(new RCArray<TriangleList<Vertex>>());
             outList.z(p)->add(Punkt(0, 0));
             bool fertig = 0;
             Vertex a;
@@ -195,7 +195,7 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                 int nachher = i + 1;
                 if (nachher >= vAnz) nachher = 0;
                 if (vorher < 0) vorher = vAnz - 1;
-                int ola = outList.z(p)->getEintragAnzahl();
+                int ola = outList.z(p)->getEntryCount();
                 for (int j = 0; j < ola; j++)
                 {
                     Punkt out = outList.z(p)->get(j);
@@ -223,8 +223,8 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                     b = pg.vertex->get(nachher);
                 if (istLinieInnen(a, b, p))
                 {
-                    DreieckListe<Vertex>* lowL = new DreieckListe<Vertex>();
-                    DreieckListe<Vertex>* heightL = new DreieckListe<Vertex>();
+                    TriangleList<Vertex>* lowL = new TriangleList<Vertex>();
+                    TriangleList<Vertex>* heightL = new TriangleList<Vertex>();
                     lowL->addPunkt(new Vertex(pg.vertex->get(i)),
                         textur ? new Vertex(pg.tKordinaten->get(i)) : 0);
                     heightL->addPunkt(new Vertex(pg.vertex->get(i)),
@@ -336,7 +336,7 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                     }
                 }
                 else
-                    lists.z(lauf)->add(new DreieckListe<Vertex>());
+                    lists.z(lauf)->add(new TriangleList<Vertex>());
                 if (fertig) break;
             }
             int maxP = -1;
@@ -365,7 +365,7 @@ void Model2DData::removeModell() // resets the vertex data
 {
     if (polygons)
     {
-        int anz = polygons->getEintragAnzahl();
+        int anz = polygons->getEntryCount();
         for (int i = 0; i < anz; i++)
         {
             if (polygons->get(i).name) polygons->get(i).name->release();
@@ -378,7 +378,7 @@ void Model2DData::removeModell() // resets the vertex data
         polygons = (Array<Polygon2D>*)polygons->release();
     }
     if (vListen)
-        vListen = (RCArray<RCArray<DreieckListe<Vertex>>>*)vListen->release();
+        vListen = (RCArray<RCArray<TriangleList<Vertex>>>*)vListen->release();
     outList.leeren();
     minP = Punkt(0, 0);
     maxP = Punkt(0, 0);
@@ -397,7 +397,7 @@ bool Model2DData::calcHitPoint(Vertex pos,
     {
         if (polygon.name->istGleich(polygonName))
         {
-            int anz = polygon.vertex->getEintragAnzahl();
+            int anz = polygon.vertex->getEntryCount();
             for (int i = 0; i < anz; i++)
             {
                 Vertex a = polygon.vertex->get(i);
@@ -474,7 +474,7 @@ bool Model2DData::split(Vertex pos,
             {
                 pos -= dir;
             }
-            int anz = polygon.vertex->getEintragAnzahl();
+            int anz = polygon.vertex->getEntryCount();
             Vertex startPoint;
             Vertex texturSP;
             int leftI = 0;
@@ -657,14 +657,14 @@ bool Model2DData::split(Vertex pos,
                 *partB.schwerpunkt += polygon.vertex->get(rightI);
                 partB.vertex->add(polygon.vertex->get(rightI));
                 partB.tKordinaten->add(polygon.tKordinaten->get(rightI));
-                *partA.schwerpunkt /= (float)partA.vertex->getEintragAnzahl();
-                *partB.schwerpunkt /= (float)partB.vertex->getEintragAnzahl();
+                *partA.schwerpunkt /= (float)partA.vertex->getEntryCount();
+                *partB.schwerpunkt /= (float)partB.vertex->getEntryCount();
                 posA = (Punkt)*partA.schwerpunkt;
                 posB = (Punkt)*partB.schwerpunkt;
-                for (int i = 0; i < partA.vertex->getEintragAnzahl(); i++)
+                for (int i = 0; i < partA.vertex->getEntryCount(); i++)
                     partA.vertex->set(
                         partA.vertex->get(i) - *partA.schwerpunkt, i);
-                for (int i = 0; i < partB.vertex->getEintragAnzahl(); i++)
+                for (int i = 0; i < partB.vertex->getEntryCount(); i++)
                     partB.vertex->set(
                         partB.vertex->get(i) - *partB.schwerpunkt, i);
                 *partA.schwerpunkt = Vertex(0, 0);
@@ -682,7 +682,7 @@ float Model2DData::getMasse() const
     for (const Polygon2D& p : *polygons)
     {
         if (p.transparent) continue;
-        int anz = p.vertex->getEintragAnzahl();
+        int anz = p.vertex->getEntryCount();
         if (anz < 3) continue;
         Vertex p1 = p.vertex->get(anz - 1);
         Vertex p2 = p.vertex->get(0);
@@ -704,7 +704,7 @@ Model2DObject::Model2DObject()
     : Object2D()
 {
     rData = 0;
-    textur = new RCArray<Textur2D>();
+    textur = new RCArray<Texture2D>();
 }
 
 // Destructor
@@ -721,13 +721,13 @@ void Model2DObject::setModel(Model2DData* mdl)
     rData = mdl;
 }
 
-void Model2DObject::setTextur(Textur2D* t)
+void Model2DObject::setTexture(Texture2D* t)
 {
     if (rData)
     {
         textur->leeren();
-        for (int i = 0; i < rData->polygons->getEintragAnzahl(); i++)
-            textur->add(dynamic_cast<Textur2D*>(t->getThis()));
+        for (int i = 0; i < rData->polygons->getEntryCount(); i++)
+            textur->add(dynamic_cast<Texture2D*>(t->getThis()));
     }
     t->release();
 }
@@ -770,13 +770,13 @@ void Model2DObject::impuls(Vertex start, Vertex speed, float strength)
     }
 }
 
-void Model2DObject::setTextur(Textur2D* t, const char* polygonName)
+void Model2DObject::setTexture(Texture2D* t, const char* polygonName)
 {
     int index = 0;
     for (const Polygon2D& i : *rData->polygons)
     {
         if (i.name->istGleich(polygonName))
-            textur->set(dynamic_cast<Textur2D*>(t->getThis()), index);
+            textur->set(dynamic_cast<Texture2D*>(t->getThis()), index);
         index++;
     }
     t->release();
@@ -792,7 +792,7 @@ void Model2DObject::render(
         Mat3<float> mat = kamMat * getObjectMatrix();
         if (textur->hat(num))
         {
-            Image* txt = textur->z(num)->zTextur();
+            Image* txt = textur->z(num)->zTexture();
             for (auto i = p->begin(); i && txt; i++)
             {
                 for (auto j = i->zListe()->begin();
@@ -813,7 +813,7 @@ void Model2DObject::render(
                                             * (float)(txt->getBreite() - 1),
                             j.next().next()->textur->y
                                 * (float)(txt->getHeight() - 1));
-                    zRObj.drawDreieckTexturAlpha(a, b, c, ta, tb, tc, *txt);
+                    zRObj.drawTriangleTextureAlpha(a, b, c, ta, tb, tc, *txt);
                 }
             }
         }
@@ -878,13 +878,13 @@ bool Model2DObject::istLinieInnen(
     Vertex a, Vertex b, bool ignoreTransparent) const
 {
     if (!rData || !rData->polygons) return 0;
-    int pAnz = rData->polygons->getEintragAnzahl();
+    int pAnz = rData->polygons->getEntryCount();
     for (int p = 0; p < pAnz; p++)
     {
         if (rData->polygons->get(p).transparent && !ignoreTransparent) continue;
         Mat3<float> mat
             = Mat3<float>::rotation(rotation) * Mat3<float>::scaling(size);
-        int anz = rData->polygons->get(p).vertex->getEintragAnzahl();
+        int anz = rData->polygons->get(p).vertex->getEntryCount();
         int j = anz - 1;
         for (int i = 0; i < anz; i++)
         {
@@ -931,7 +931,7 @@ bool Model2DObject::istModelInnen(
     for (const Polygon2D& polygon : *rData->polygons)
     {
         if (polygon.transparent && !ignoreTransparent) continue;
-        int anz = polygon.vertex->getEintragAnzahl();
+        int anz = polygon.vertex->getEntryCount();
         for (int i = 0; i < anz; i++)
         {
             if (zObj->istPunktInnen(
@@ -1018,14 +1018,14 @@ float Model2DObject::getMasse() const
 }
 
 // Returns the texture of the first polygon
-Textur2D* Model2DObject::getTextur() const
+Texture2D* Model2DObject::getTexture() const
 {
     return textur->get(0);
 }
 
 // Returns the texture of a polygon
 //  polygonName: The name of the polygon
-Textur2D* Model2DObject::getTextur(const char* polygonName) const
+Texture2D* Model2DObject::getTexture(const char* polygonName) const
 {
     int index = 0;
     for (const Polygon2D& p : *rData->polygons)
@@ -1037,14 +1037,14 @@ Textur2D* Model2DObject::getTextur(const char* polygonName) const
 }
 
 // Returns the texture of the first polygon without increased reference counter
-Textur2D* Model2DObject::zTextur() const
+Texture2D* Model2DObject::zTexture() const
 {
     return textur->z(0);
 }
 
 // Returns the texture of a polygon without increased reference counter
 //  polygonName: The name of the polygon
-Textur2D* Model2DObject::zTextur(const char* polygonName) const
+Texture2D* Model2DObject::zTexture(const char* polygonName) const
 {
     int index = 0;
     for (const Polygon2D& p : *rData->polygons)
@@ -1075,7 +1075,7 @@ Model2D::Model2D()
     rData = 0;
     drehung = 0;
     size = 1;
-    textur = new RCArray<Textur2D>;
+    textur = new RCArray<Texture2D>;
 }
 
 // Destructor
@@ -1124,23 +1124,23 @@ void Model2D::addSize(float size)
     rend = 1;
 }
 
-void Model2D::setTextur(Textur2D* t)
+void Model2D::setTexture(Texture2D* t)
 {
     if (rData)
     {
-        for (int i = 0; i < rData->polygons->getEintragAnzahl(); i++)
-            textur->set(dynamic_cast<Textur2D*>(t->getThis()), i);
+        for (int i = 0; i < rData->polygons->getEntryCount(); i++)
+            textur->set(dynamic_cast<Texture2D*>(t->getThis()), i);
     }
     t->release();
 }
 
-void Model2D::setTextur(Textur2D* t, const char* polygonName)
+void Model2D::setTexture(Texture2D* t, const char* polygonName)
 {
     int index = 0;
     for (const Polygon2D& p : *rData->polygons)
     {
         if (p.name->istGleich(polygonName))
-            textur->set(dynamic_cast<Textur2D*>(t->getThis()), index);
+            textur->set(dynamic_cast<Texture2D*>(t->getThis()), index);
         index++;
     }
     t->release();
@@ -1168,9 +1168,9 @@ void Model2D::render(Image& zRObj)
         Mat3<float> mat = Mat3<float>::translation(pos)
                         * Mat3<float>::rotation(drehung)
                         * Mat3<float>::scaling(size);
-        if (hatStyle(Model2D::Style::Textur))
+        if (hatStyle(Model2D::Style::Texture))
         {
-            if (!textur || !textur->z(num) || !textur->z(num)->zTextur()
+            if (!textur || !textur->z(num) || !textur->z(num)->zTexture()
                 || !rData->polygons->get(num).tKordinaten)
             {
                 for (auto i : *p)
@@ -1191,7 +1191,7 @@ void Model2D::render(Image& zRObj)
             }
             else
             {
-                Image* txt = textur->z(num)->zTextur();
+                Image* txt = textur->z(num)->zTexture();
                 for (auto i : *p)
                 {
                     for (auto j = i->zListe()->begin();
@@ -1214,7 +1214,7 @@ void Model2D::render(Image& zRObj)
                                 j.next().next()->textur->y
                                     * (float)(txt->getHeight() - 1));
                         if (hatStyle(Model2D::Style::Alpha))
-                            zRObj.drawDreieckTexturAlpha(
+                            zRObj.drawTriangleTextureAlpha(
                                 a, b, c, ta, tb, tc, *txt);
                         else
                             zRObj.drawDreieckTextur(a, b, c, ta, tb, tc, *txt);
@@ -1306,7 +1306,7 @@ bool Model2D::istPunktInnen(Vertex p) const
         if (polygon.transparent) continue;
         Mat3<float> mat
             = Mat3<float>::rotation(drehung) * Mat3<float>::scaling(size);
-        int anz = polygon.vertex->getEintragAnzahl();
+        int anz = polygon.vertex->getEntryCount();
         bool c = 0;
         int j = anz - 1;
         for (int i = 0; i < anz; i++)
@@ -1327,13 +1327,13 @@ bool Model2D::istPunktInnen(Vertex p) const
 bool Model2D::istLinieInnen(Vertex a, Vertex b) const
 {
     if (!rData || !rData->polygons) return 0;
-    int pAnz = rData->polygons->getEintragAnzahl();
+    int pAnz = rData->polygons->getEntryCount();
     for (int p = 0; p < pAnz; p++)
     {
         if (rData->polygons->get(p).transparent) continue;
         Mat3<float> mat
             = Mat3<float>::rotation(drehung) * Mat3<float>::scaling(size);
-        int anz = rData->polygons->get(p).vertex->getEintragAnzahl();
+        int anz = rData->polygons->get(p).vertex->getEntryCount();
         int j = anz - 1;
         for (int i = 0; i < anz; i++)
         {
@@ -1387,7 +1387,7 @@ bool Model2D::istModelInnen(const Model2D* zMdl, bool end) const
     for (const Polygon2D& polygon : *rData->polygons)
     {
         if (polygon.transparent) continue;
-        int anz = polygon.vertex->getEintragAnzahl();
+        int anz = polygon.vertex->getEntryCount();
         for (int i = 0; i < anz; i++)
         {
             if (zMdl->istPunktInnen(mat * polygon.vertex->get(i))) return 1;

Model2D.h

@@ -12,7 +12,7 @@
 
 namespace Framework
 {
-    class Textur2D;
+    class Texture2D;
 
     //! A polygon structure used by Model2D.
     //! Model2D class deletes the pointers
@@ -42,7 +42,7 @@ namespace Framework
 
     public:
         Array<Polygon2D>* polygons;
-        RCArray<RCArray<DreieckListe<Vertex>>>* vListen;
+        RCArray<RCArray<TriangleList<Vertex>>>* vListen;
         Punkt minP, maxP;
 
         //! Constructor
@@ -96,7 +96,7 @@ namespace Framework
     {
     private:
         Model2DData* rData;
-        RCArray<Textur2D>* textur;
+        RCArray<Texture2D>* textur;
 
     public:
         //! Constructor
@@ -108,12 +108,12 @@ namespace Framework
         __declspec(dllexport) void setModel(Model2DData* mdl);
         //! Sets the texture
         //! \param t The image to use as texture
-        __declspec(dllexport) void setTextur(Textur2D* t);
+        __declspec(dllexport) void setTexture(Texture2D* t);
         //! Sets the texture
         //! \param t The image to use as texture
         //! \param polygonName The name of the polygon to receive the texture
-        __declspec(dllexport) void setTextur(
-            Textur2D* t, const char* polygonName);
+        __declspec(dllexport) void setTexture(
+            Texture2D* t, const char* polygonName);
         __declspec(dllexport) void impuls(
             Vertex start, Vertex speed, float strength = 1.f) override;
         //! Draws the drawing into a specific image
@@ -157,17 +157,17 @@ namespace Framework
         //! non-transparent polygons)
         __declspec(dllexport) float getMasse() const override;
         //! Returns the texture of the first polygon
-        __declspec(dllexport) Textur2D* getTextur() const;
+        __declspec(dllexport) Texture2D* getTexture() const;
         //! Returns the texture of a polygon
         //! \param polygonName The name of the polygon
-        __declspec(dllexport) Textur2D* getTextur(
+        __declspec(dllexport) Texture2D* getTexture(
             const char* polygonName) const;
         //! Returns the texture of the first polygon without increased
         //! reference counter
-        __declspec(dllexport) Textur2D* zTextur() const;
+        __declspec(dllexport) Texture2D* zTexture() const;
         //! Returns the texture of a polygon without increased reference
         //! counter \param polygonName The name of the polygon
-        __declspec(dllexport) Textur2D* zTextur(const char* polygonName) const;
+        __declspec(dllexport) Texture2D* zTexture(const char* polygonName) const;
         //! Returns the model data
         __declspec(dllexport) Model2DData* getModel() const;
         //! Returns the model data without increased reference counter
@@ -181,7 +181,7 @@ namespace Framework
         class Style : public Drawable::Style
         {
         public:
-            static const __int64 Textur
+            static const __int64 Texture
                 = 0x8; //! If this flag is set, a texture is used when drawing
             static const __int64 Border
                 = 0x10; //! If this flag is set, the polygon borders are drawn
@@ -196,7 +196,7 @@ namespace Framework
         float drehung;
         float size;
         int farbe;
-        RCArray<Textur2D>* textur;
+        RCArray<Texture2D>* textur;
 
     public:
         //! Constructor
@@ -220,12 +220,12 @@ namespace Framework
         __declspec(dllexport) void addSize(float size);
         //! Sets the texture
         //! \param t The image to use as texture
-        __declspec(dllexport) void setTextur(Textur2D* t);
+        __declspec(dllexport) void setTexture(Texture2D* t);
         //! Sets the texture
         //! \param t The image to use as texture
         //! \param polygonName The name of the polygon to receive the texture
-        __declspec(dllexport) void setTextur(
-            Textur2D* t, const char* polygonName);
+        __declspec(dllexport) void setTexture(
+            Texture2D* t, const char* polygonName);
         //! Sets the color
         //! \param f The color in A8R8G8B8 format
         __declspec(dllexport) void setFarbe(int f);

Model3D.cpp

@@ -492,7 +492,7 @@ void Model3DData::copyModel2D(Model2DData* model, float z)
         clearModel();
         int vAnz = 0;
         for (const Polygon2D& p : *model->polygons)
-            vAnz += p.vertex->getEintragAnzahl();
+            vAnz += p.vertex->getEntryCount();
         Vertex3D* vertexList = new Vertex3D[vAnz];
         int index = 0;
         for (auto i : *model->vListen)
@@ -570,7 +570,7 @@ int Model3DData::kalkulateMatrix(const Mat4<float>& modelMatrix,
 // Returns the number of polygons
 int Model3DData::getPolygonAnzahl() const
 {
-    return polygons->getEintragAnzahl();
+    return polygons->getEntryCount();
 }
 
 // Returns a specific polygon
@@ -672,19 +672,19 @@ Vec3<float> Model3DData::getMaxPos() const
     return maxPos;
 }
 
-// Contents of the Model3DTextur class
+// Contents of the Model3DTexture class
 
 // Constructor
-Model3DTextur::Model3DTextur()
+Model3DTexture::Model3DTexture()
     : ReferenceCounter()
 {
-    textures = new Textur*[1];
+    textures = new Texture*[1];
     textures[0] = 0;
     textureCount = 1;
 }
 
 // Destructor
-Model3DTextur::~Model3DTextur()
+Model3DTexture::~Model3DTexture()
 {
     for (int i = 0; i < textureCount; i++)
     {
@@ -696,16 +696,16 @@ Model3DTextur::~Model3DTextur()
 // Sets which texture is for which polygon
 //  pI: The index of the polygon
 //  txt: The texture of the polygon
-void Model3DTextur::setPolygonTextur(int pI, Textur* txt)
+void Model3DTexture::setPolygonTexture(int pI, Texture* txt)
 {
     if (pI >= textureCount)
     {
-        Textur** tmp = textures;
-        textures = new Textur*[pI + 1];
-        memcpy(textures, tmp, sizeof(Textur*) * textureCount);
+        Texture** tmp = textures;
+        textures = new Texture*[pI + 1];
+        memcpy(textures, tmp, sizeof(Texture*) * textureCount);
         memset(textures + textureCount,
             0,
-            sizeof(Textur*) * (pI + 1 - textureCount));
+            sizeof(Texture*) * (pI + 1 - textureCount));
         delete[] tmp;
         textureCount = pI + 1;
     }
@@ -716,7 +716,7 @@ void Model3DTextur::setPolygonTextur(int pI, Textur* txt)
 // Returns a pointer to the texture of a polygon without increased
 // reference counter
 //  i: The index of the polygon
-Textur* Model3DTextur::zPolygonTextur(int i) const
+Texture* Model3DTexture::zPolygonTexture(int i) const
 {
     if (i >= textureCount) return 0;
     return textures[i];
@@ -761,7 +761,7 @@ void Model3D::setModelDaten(Model3DData* data)
 
 // Sets the textures to be used for drawing
 //  txt: A list of textures assigned to the different polygons
-void Model3D::setModelTextur(Model3DTextur* txt)
+void Model3D::setModelTextur(Model3DTexture* txt)
 {
     if (textur) textur->release();
     textur = txt;
@@ -827,13 +827,13 @@ void Model3D::afterRender(
 {}
 
 // Returns the texture
-Model3DTextur* Model3D::getTextur()
+Model3DTexture* Model3D::getTexture()
 {
-    return textur ? dynamic_cast<Model3DTextur*>(textur->getThis()) : 0;
+    return textur ? dynamic_cast<Model3DTexture*>(textur->getThis()) : 0;
 }
 
 // Returns the texture (without increased reference counter)
-Model3DTextur* Model3D::zTextur()
+Model3DTexture* Model3D::zTexture()
 {
     return textur;
 }
@@ -925,10 +925,10 @@ float Model3D::traceRay(
 // Calculates the color of the intersection point of a ray
 //  point: the start point of the ray in world coordinates
 //  dir: the direction of the ray in world coordinates
-//  zWelt: the world the ray comes from
+//  zWorld: the world the ray comes from
 //  return: the color of the intersection point
 int Model3D::traceRay(
-    Vec3<float>& p, Vec3<float>& d, int pId, Welt3D* zWelt) const
+    Vec3<float>& p, Vec3<float>& d, int pId, World3D* zWorld) const
 {
     Vec3<float> dir = d;
     dir.rotateY(-angle.y);
@@ -971,7 +971,7 @@ int Model3D::traceRay(
                     float a3
                         = (a - hit).crossProduct(b - hit).getLength() / 2 / a0;
                     Vertex ht = at * a1 + bt * a2 + ct * a3;
-                    Image* tex = textur->zPolygonTextur(index)->zImage();
+                    Image* tex = textur->zPolygonTexture(index)->zImage();
                     if (ht.x >= 0 && ht.y >= 0 && ht.x <= 1 && ht.y <= 1)
                         return tex->getPixel(
                             (int)(ht.x * ((float)tex->getBreite() - 1.f)
@@ -1030,7 +1030,7 @@ bool Model3D::needRenderPolygon(int index)
     return 1;
 }
 
-Textur* Model3D::zEffectTextur()
+Texture* Model3D::zEffectTexture()
 {
     return 0;
 }

Model3D.h

@@ -10,17 +10,17 @@ struct ID3D11Buffer;
 namespace Framework
 {
     struct Polygon2D;    //! Model2D.h
-    class Textur;        //! Texture.h
+    class Texture;        //! Texture.h
     class Model2DData;   //! Model2D.h
     class DXBuffer;      //! DXBuffer.h
     class Render3D;      //! Render3D.h
-    class Model3DTextur; //! Model3D.h
+    class Model3DTexture; //! Model3D.h
     class Model3DList;   //! Model3DList.h
-    class Welt3D;        //! World3D.h
+    class World3D;        //! World3D.h
     class DXBuffer;
     class Shader;
     class GraphicsApi;
-    class M3Datei;
+    class M3File;
 
     //! Represents a bone of a 3D model. Can be animated
     class Bone
@@ -124,7 +124,7 @@ namespace Framework
         //! bones in a sceleton. if the sceleton is full -1 is returned
         DLLEXPORT int getNextBoneId() const;
 
-        friend M3Datei;
+        friend M3File;
     };
 
     //! A structure that stores the spatial position, texture coordinates,
@@ -269,24 +269,24 @@ namespace Framework
     };
 
     //! Stores a list of textures and which texture to use for which polygon
-    class Model3DTextur : public virtual ReferenceCounter
+    class Model3DTexture : public virtual ReferenceCounter
     {
     private:
-        Textur** textures;
+        Texture** textures;
         int textureCount;
 
     public:
         //! Constructor
-        DLLEXPORT Model3DTextur();
+        DLLEXPORT Model3DTexture();
         //! Destructor
-        DLLEXPORT ~Model3DTextur();
+        DLLEXPORT ~Model3DTexture();
         //! Sets which texture is for which polygon
         //! \param pI The index of the polygon
         //! \param txt The texture of the polygon
-        DLLEXPORT void setPolygonTextur(int pI, Textur* txt);
+        DLLEXPORT void setPolygonTexture(int pI, Texture* txt);
         //! Returns a pointer to the texture of a polygon without increased
         //! reference counter \param i The index of the polygon
-        DLLEXPORT Textur* zPolygonTextur(int i) const;
+        DLLEXPORT Texture* zPolygonTexture(int i) const;
     };
 
     //! A drawing of the 3D framework that can display a 3D model with
@@ -296,7 +296,7 @@ namespace Framework
     protected:
         Skeleton* skelett;
         Model3DData* model;
-        Model3DTextur* textur;
+        Model3DTexture* textur;
         float ambientFactor;
         float diffusFactor;
         float specularFactor;
@@ -311,7 +311,7 @@ namespace Framework
         DLLEXPORT void setModelDaten(Model3DData* data);
         //! Sets the textures to use for drawing
         //! \param txt A list of textures assigned to the different polygons
-        DLLEXPORT void setModelTextur(Model3DTextur* txt);
+        DLLEXPORT void setModelTextur(Model3DTexture* txt);
         //! Sets the factor by which the ambient light (texture color)
         //! is multiplied \param f The new factor (from 0 to 1, ambient +
         //! specular + diffuse = 1)
@@ -340,9 +340,9 @@ namespace Framework
         DLLEXPORT virtual void afterRender(
             GraphicsApi* api, Shader* zVertexShader, Shader* zPixelShader);
         //! Returns the texture
-        DLLEXPORT Model3DTextur* getTextur();
+        DLLEXPORT Model3DTexture* getTexture();
         //! Returns the texture (without increased reference counter)
-        DLLEXPORT Model3DTextur* zTextur();
+        DLLEXPORT Model3DTexture* zTexture();
         //! Returns the model data
         DLLEXPORT Model3DData* getModelData();
         //! Returns the model data (without increased reference counter)
@@ -361,10 +361,10 @@ namespace Framework
         //! Calculates the color of a ray's intersection point
         //! \param point The starting point of the ray in world coordinates
         //! \param dir The direction of the ray in world coordinates
-        //! \param zWelt The world from which the ray originates
+        //! \param zWorld The world from which the ray originates
         //! \return The color of the intersection point
         DLLEXPORT virtual int traceRay(
-            Vec3<float>& point, Vec3<float>& dir, int pId, Welt3D* zWelt) const;
+            Vec3<float>& point, Vec3<float>& dir, int pId, World3D* zWorld) const;
         //! Returns the ID of the data if registered in a Model3DList.
         //! (see Framework::zM3DRegister())
         DLLEXPORT int getDatenId() const;
@@ -383,7 +383,7 @@ namespace Framework
         DLLEXPORT const Vertex3D* zVertexBuffer() const;
         //! Returns true if a specific polygon needs to be drawn
         DLLEXPORT virtual bool needRenderPolygon(int index);
-        DLLEXPORT virtual Textur* zEffectTextur();
+        DLLEXPORT virtual Texture* zEffectTexture();
         DLLEXPORT virtual float getEffectPercentage();
     };
 } // namespace Framework

Mouse.cpp

@@ -5,15 +5,15 @@
 
 using namespace Framework;
 
-// Contents of the Maus class from Mouse.h
+// Contents of the Mouse class from Mouse.h
 // Constructor
-Maus::Maus()
+Mouse::Mouse()
     : ReferenceCounter(),
       hMaus(LoadCursor(0, IDC_ARROW))
 {}
 
 // non-constant
-void Maus::ladeMaus(int mausId)
+void Mouse::loadMouse(int mausId)
 {
     if (mausId == MausId::nichts) hMaus = 0;
     if (mausId == MausId::normal) hMaus = LoadCursor(0, IDC_ARROW);
@@ -29,7 +29,7 @@ void Maus::ladeMaus(int mausId)
     SetCursor(hMaus);
 }
 
-void Maus::ladeMaus(Image* maus)
+void Mouse::loadMouse(Image* maus)
 {
     HBITMAP hAndMaskBitmap;
     HBITMAP hXorMaskBitmap;
@@ -90,13 +90,13 @@ void Maus::ladeMaus(Image* maus)
     SetCursor(hMaus);
 }
 
-void Maus::update()
+void Mouse::update()
 {
     SetCursor(hMaus);
 }
 
 // constant
-HCURSOR Maus::getMausHandle()
+HCURSOR Mouse::getMouseHandle()
 {
     return hMaus;
 }

Mouse.h

@@ -1,5 +1,5 @@
-#ifndef Maus_H
-#define Maus_H
+#ifndef Mouse_H
+#define Mouse_H
 
 #include "OperatingSystem.h"
 #include "ReferenceCounter.h"
@@ -7,7 +7,7 @@
 namespace Framework
 {
     class Image; //! from Image.h
-    class Maus; //! from this file
+    class Mouse; //! from this file
 
     namespace MausId
     {
@@ -26,26 +26,26 @@ namespace Framework
 
     //! This class manages the mouse cursor image.
     //! It is used internally by the framework.
-    //! See Globals.h MausZeiger
-    class Maus : public virtual ReferenceCounter
+    //! See Globals.h mousePointer
+    class Mouse : public virtual ReferenceCounter
     {
     private:
         HCURSOR hMaus;
 
     public:
         //! Constructor
-        DLLEXPORT Maus();
+        DLLEXPORT Mouse();
         //! Loads a mouse cursor from Windows
         //! \param mausId Values from the MausId namespace
-        //! Example: ladeMaus( MausId::hand );
-        DLLEXPORT void ladeMaus(int mausId);
+        //! Example: loadMouse( MausId::hand );
+        DLLEXPORT void loadMouse(int mausId);
         //! Copies an image and uses it as mouse cursor.
         //! \param maus The image to use as mouse cursor
-        DLLEXPORT void ladeMaus(Image* maus);
+        DLLEXPORT void loadMouse(Image* maus);
         //! Updates the mouse. Called by the framework itself
         DLLEXPORT void update();
         //! returns a handle to the mouse cursor.
-        DLLEXPORT HCURSOR getMausHandle();
+        DLLEXPORT HCURSOR getMouseHandle();
     };
 } // namespace Framework
 

MouseEvent.cpp

@@ -4,12 +4,12 @@
 
 using namespace Framework;
 
-bool Framework::_ret1ME(void* param, void* obj, MausEreignis me)
+bool Framework::_ret1ME(void* param, void* obj, MouseEvent me)
 {
     return 1;
 }
 
-bool Framework::_closeWindowME(void* param, void* obj, MausEreignis me)
+bool Framework::_closeWindowME(void* param, void* obj, MouseEvent me)
 {
     if (me.id == ME_RLinks)
         ((Window*)obj)->removeStyle(Window::Style::Sichtbar);

MouseEvent.h

@@ -28,7 +28,7 @@ namespace Framework
     const int ME_LScroll = 15;
 
     //! Stores a specific mouse input from the user
-    struct MausEreignis
+    struct MouseEvent
     {
         //! Type of input
         int id;
@@ -48,7 +48,7 @@ namespace Framework
     };
 
     //! Stores a specific mouse input from the user in 3D
-    struct MausEreignis3D
+    struct MouseEvent3D
     {
         //! Type of input
         int id;
@@ -60,7 +60,7 @@ namespace Framework
         bool verarbeitet;
     };
 
-    typedef std::function<bool(void*, void*, MausEreignis)> MausAktion;
+    typedef std::function<bool(void*, void*, MouseEvent)> MausAktion;
 
     //! Default mouse event callback function
     //! \param param An arbitrary parameter
@@ -68,7 +68,7 @@ namespace Framework
     //! \param te The mouse event to process
     //! \return (true) if the calling drawing should continue processing
     //! the event. (false) otherwise. Always returns (true)
-    DLLEXPORT bool _ret1ME(void* param, void* obj, MausEreignis me);
+    DLLEXPORT bool _ret1ME(void* param, void* obj, MouseEvent me);
     //! Default mouse event callback function
     //! \param param An arbitrary parameter
     //! \param obj The drawing that calls this function
@@ -76,7 +76,7 @@ namespace Framework
     //! \return (true) if the calling drawing should continue processing
     //! the event. (false) otherwise. Always returns (true) and closes the
     //! window that called it (may only be set on windows)
-    DLLEXPORT bool _closeWindowME(void* param, void* obj, MausEreignis me);
+    DLLEXPORT bool _closeWindowME(void* param, void* obj, MouseEvent me);
 } // namespace Framework
 
 #endif

ObjFile.cpp

@@ -1,4 +1,4 @@
-#include "ObjFile.h"
+#include "ObjFile.h"
 
 #include "Model3D.h"
 #include "Vec2.h"
@@ -8,8 +8,8 @@ using namespace Framework;
 ObjFile::ObjFile(const char* path)
     : ReferenceCounter()
 {
-    file.setDatei(path);
-    file.open(Datei::Style::lesen);
+    file.setFile(path);
+    file.open(File::Style::lesen);
     Text* line = file.leseZeile();
     while (line)
     {
@@ -95,7 +95,7 @@ void ObjFile::readModel(Model3DData* zTarget)
     }
     // compute vertex data and index buffer
     Array<Vertex3D> modelData;
-    int* indexList = new int[indices.getEintragAnzahl()];
+    int* indexList = new int[indices.getEntryCount()];
     int rInd = 0;
     for (Vec3<int> index : indices)
     {
@@ -113,23 +113,23 @@ void ObjFile::readModel(Model3DData* zTarget)
                 break;
             ind++;
         }
-        if (modelData.getEintragAnzahl() == ind) modelData.add(current);
+        if (modelData.getEntryCount() == ind) modelData.add(current);
         indexList[rInd++] = ind;
     }
-    Vertex3D* vertexData = new Vertex3D[modelData.getEintragAnzahl()];
+    Vertex3D* vertexData = new Vertex3D[modelData.getEntryCount()];
     int ind = 0;
     for (const Vertex3D& vertex : modelData)
         vertexData[ind++] = vertex;
-    zTarget->setVertecies(vertexData, modelData.getEintragAnzahl());
+    zTarget->setVertecies(vertexData, modelData.getEntryCount());
     Polygon3D* polygon = new Polygon3D();
-    polygon->indexAnz = indices.getEintragAnzahl();
+    polygon->indexAnz = indices.getEntryCount();
     polygon->indexList = indexList;
     zTarget->addPolygon(polygon);
 }
 
 bool ObjFile::loadModel(const char* name, Model3DData* zTarget)
 {
-    file.open(Datei::Style::lesen);
+    file.open(File::Style::lesen);
     Text* line = file.leseZeile();
     while (line)
     {

ObjFile.h

@@ -12,7 +12,7 @@ namespace Framework
     class ObjFile : public ReferenceCounter
     {
     private:
-        Datei file;
+        File file;
         RCArray<Text> objectNames;
 
         Vec3<int> parseIndex(Text* s);

Plane3D.h

@@ -6,7 +6,7 @@ namespace Framework
 {
     template<typename T>
     //! Stores a 3D plane in coordinate form (x*?+y*?+z*?-w=0)
-    class Ebene3D
+    class Plane3D
     {
     public:
         T x; //! The X component of the normal vector of the plane
@@ -16,7 +16,7 @@ namespace Framework
              //! vector must have to lie on the plane
 
         //! Constructor
-        inline Ebene3D()
+        inline Plane3D()
             : x((T)0),
               y((T)0),
               z((T)0),
@@ -29,7 +29,7 @@ namespace Framework
         //! \param z The Z component of the normal vector of the plane
         //! \param w The value the dot product of a vector with the
         //! normal vector must have to lie on the plane
-        inline Ebene3D(T x, T y, T z, T w)
+        inline Plane3D(T x, T y, T z, T w)
             : x(x),
               y(y),
               z(z),
@@ -38,12 +38,12 @@ namespace Framework
 
         //! Constructor
         //! \param vect The plane whose values should be copied
-        inline Ebene3D(const Ebene3D& vect)
-            : Ebene3D(vect.x, vect.y, vect.z, vect.w)
+        inline Plane3D(const Plane3D& vect)
+            : Plane3D(vect.x, vect.y, vect.z, vect.w)
         {}
 
         //! Normalizes the normal vector of the plane to length 1
-        inline Ebene3D& normalize()
+        inline Plane3D& normalize()
         {
             const T length = len();
             x /= length;
@@ -55,9 +55,9 @@ namespace Framework
 
         //! Swaps the values of two planes
         //! \param vect The other plane
-        inline Ebene3D& Swap(Ebene3D& vect)
+        inline Plane3D& Swap(Plane3D& vect)
         {
-            const Ebene3D tmp = vect;
+            const Plane3D tmp = vect;
             vect = *this;
             *this = tmp;
             return *this;
@@ -65,7 +65,7 @@ namespace Framework
 
         //! Copies the values of another plane
         //! \param r The other plane
-        inline Ebene3D operator=(const Ebene3D& r)
+        inline Plane3D operator=(const Plane3D& r)
         {
             x = r.x;
             y = r.y;
@@ -76,7 +76,7 @@ namespace Framework
 
         //! Adds another plane
         //! \param r The other plane
-        inline Ebene3D operator+=(const Ebene3D& r)
+        inline Plane3D operator+=(const Plane3D& r)
         {
             x += r.x;
             y += r.y;
@@ -87,7 +87,7 @@ namespace Framework
 
         //! Subtracts another plane
         //! \param r The other plane
-        inline Ebene3D operator-=(const Ebene3D& r)
+        inline Plane3D operator-=(const Plane3D& r)
         {
             x -= r.x;
             y -= r.y;
@@ -98,7 +98,7 @@ namespace Framework
 
         //! Multiplies the plane by a factor
         //! \param r The factor
-        inline Ebene3D operator*=(const T& r)
+        inline Plane3D operator*=(const T& r)
         {
             x *= r;
             y *= r;
@@ -109,7 +109,7 @@ namespace Framework
 
         //! Divides the plane by a factor
         //! \param r The factor
-        inline Ebene3D operator/=(const T& r)
+        inline Plane3D operator/=(const T& r)
         {
             x /= r;
             y /= r;
@@ -120,7 +120,7 @@ namespace Framework
 
         template<typename T2>
         //! Converts the plane to another type
-        inline operator Ebene3D<T2>() const
+        inline operator Plane3D<T2>() const
         {
             return {(T2)x, (T2)y, (T2)z, (T2)w};
         }
@@ -146,42 +146,42 @@ namespace Framework
 
         //! Adds two planes
         //! \param r The other plane
-        inline Ebene3D operator+(const Ebene3D& r) const
+        inline Plane3D operator+(const Plane3D& r) const
         {
             return Vec4(*this) += r;
         }
 
         //! Subtracts two planes
         //! \param r The other plane
-        inline Ebene3D operator-(const Ebene3D& r) const
+        inline Plane3D operator-(const Plane3D& r) const
         {
-            return Ebene3D(*this) -= r;
+            return Plane3D(*this) -= r;
         }
 
         //! Multiplies the plane by a factor
         //! r: The factor
-        inline Ebene3D operator*(const T& r) const
+        inline Plane3D operator*(const T& r) const
         {
-            return Ebene3D(*this) *= r;
+            return Plane3D(*this) *= r;
         }
 
         //! Divides the plane by a factor
         //! \param r The factor
-        inline Ebene3D operator/(const T& r) const
+        inline Plane3D operator/(const T& r) const
         {
-            return Ebene3D(*this) /= r;
+            return Plane3D(*this) /= r;
         }
 
         //! Checks two planes for equality
         //! \param r The other plane
-        inline bool operator==(const Ebene3D& r) const
+        inline bool operator==(const Plane3D& r) const
         {
             return x == r.x && y == r.y && z == r.z && w == r.w;
         }
 
         //! Checks two planes for inequality
         //! \param r The other plane
-        inline bool operator!=(const Ebene3D& r) const
+        inline bool operator!=(const Plane3D& r) const
         {
             return !(*this == r);
         }

Process.cpp

@@ -10,9 +10,9 @@
 
 using namespace Framework;
 
-// Contents of the Prozess class from Process.h
+// Contents of the Process class from Process.h
 // Constructor
-Prozess::Prozess()
+Process::Process()
     : ReferenceCounter()
 {
 #ifdef WIN32
@@ -34,7 +34,7 @@ Prozess::Prozess()
 
 // non-constant
 #ifdef WIN32
-void Prozess::setProcess(void* pHandle)
+void Process::setProcess(void* pHandle)
 {
     this->pHandle = pHandle;
     SYSTEM_INFO sysInfo;
@@ -52,7 +52,7 @@ void Prozess::setProcess(void* pHandle)
 }
 #endif
 // constant
-double Prozess::getCPU() const
+double Process::getCPU() const
 {
 #ifdef WIN32
     FILETIME ftime, fsys, fuser;
@@ -79,7 +79,7 @@ double Prozess::getCPU() const
 #endif
 }
 
-__int64 Prozess::getMem() const
+__int64 Process::getMem() const
 {
 #ifdef WIN32
     PROCESS_MEMORY_COUNTERS pMemCountr;
@@ -121,7 +121,7 @@ __int64 Prozess::getMem() const
 #endif
 }
 #ifdef WIN32
-MemoryInfo Prozess::getMemInfo() const
+MemoryInfo Process::getMemInfo() const
 {
     PROCESS_MEMORY_COUNTERS pMemCountr;
     pMemCountr = PROCESS_MEMORY_COUNTERS();
@@ -145,7 +145,7 @@ MemoryInfo Prozess::getMemInfo() const
     return ret;
 }
 
-int Prozess::getThreadAnzahl() const
+int Process::getThreadAnzahl() const
 {
     int ret = 0;
     DWORD processID = GetCurrentProcessId();

Process.h

@@ -13,7 +13,7 @@ namespace Framework
 #ifdef WIN32
     struct MemoryInfo; //! from this file
 #endif
-    class Prozess; //! from this file
+    class Process; //! from this file
 
 #ifdef WIN32
     struct MemoryInfo
@@ -31,7 +31,7 @@ namespace Framework
 #endif
     //! This class retrieves information about a running process
     //! (CPU, MEM). On Ubuntu always the own process
-    class Prozess : public virtual ReferenceCounter
+    class Process : public virtual ReferenceCounter
     {
     private:
 #ifdef WIN32
@@ -42,7 +42,7 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT Prozess();
+        DLLEXPORT Process();
         //! non-constant
 #ifdef WIN32
         //! Sets the process to monitor (Windows only)

Progress.cpp

@@ -9,9 +9,9 @@
 
 using namespace Framework;
 
-// Contents of the FBalken class from Progress.h
+// Contents of the ProgressBar class from Progress.h
 // Constructor
-FBalken::FBalken()
+ProgressBar::ProgressBar()
     : DrawableBackground(),
       maxAk(0),
       ak(0),
@@ -27,7 +27,7 @@ FBalken::FBalken()
 }
 
 // Destructor
-FBalken::~FBalken()
+ProgressBar::~ProgressBar()
 {
     if (fBorder) fBorder->release();
     if (fBuffer) fBuffer->release();
@@ -36,26 +36,26 @@ FBalken::~FBalken()
 }
 
 // non-constant
-void FBalken::setAktionAnzahl(__int64 ak) // sets the number of actions
+void ProgressBar::setAktionAnzahl(__int64 ak) // sets the number of actions
 {
     maxAk = ak;
     rend = 1;
 }
 
-void FBalken::aktionPlus(__int64 aktionen) // multiple actions are finished
+void ProgressBar::aktionPlus(__int64 aktionen) // multiple actions are finished
 {
     ak += aktionen;
     if (ak > maxAk) ak = maxAk;
     rend = 1;
 }
 
-void FBalken::reset() // resets the completed actions
+void ProgressBar::reset() // resets the completed actions
 {
     ak = 0;
     rend = 1;
 }
 
-void FBalken::setFBorderZ(
+void ProgressBar::setFBorderZ(
     Border* ram) // sets a pointer to the completion border
 {
     if (fBorder) fBorder->release();
@@ -63,57 +63,57 @@ void FBalken::setFBorderZ(
     rend = 1;
 }
 
-void FBalken::setFRFarbe(int f) // sets the completion border color
+void ProgressBar::setFRFarbe(int f) // sets the completion border color
 {
     if (!fBorder) fBorder = new LBorder();
     fBorder->setFarbe(f);
     rend = 1;
 }
 
-void FBalken::setFRBreite(int br) // sets the completion border width
+void ProgressBar::setFRBreite(int br) // sets the completion border width
 {
     if (!fBorder) fBorder = new LBorder();
     fBorder->setRamenBreite(br);
     rend = 1;
 }
 
-void FBalken::setFAlphaFeldZ(
-    AlphaFeld* af) // sets a pointer to the completion AlphaFeld
+void ProgressBar::setFAlphaFieldZ(
+    AlphaField* af) // sets a pointer to the completion AlphaField
 {
     if (fBuffer) fBuffer->release();
     fBuffer = af;
     rend = 1;
 }
 
-void FBalken::setFAFFarbe(int f) // sets the completion AlphaFeld color
+void ProgressBar::setFAFFarbe(int f) // sets the completion AlphaField color
 {
-    if (!fBuffer) fBuffer = new AlphaFeld();
+    if (!fBuffer) fBuffer = new AlphaField();
     fBuffer->setFarbe(f);
     rend = 1;
 }
 
-void FBalken::setFAFStrength(
-    int st) // sets the strength of the completion AlphaFeld
+void ProgressBar::setFAFStrength(
+    int st) // sets the strength of the completion AlphaField
 {
-    if (!fBuffer) fBuffer = new AlphaFeld();
+    if (!fBuffer) fBuffer = new AlphaField();
     fBuffer->setStrength(st);
     rend = 1;
 }
 
-void FBalken::setFBgFarbe(int f) // sets the completion background color
+void ProgressBar::setFBgFarbe(int f) // sets the completion background color
 {
     fBgF = f;
     rend = 1;
 }
 
-void FBalken::setFBgImageZ(Image* b) // sets the completion background image
+void ProgressBar::setFBgImageZ(Image* b) // sets the completion background image
 {
     if (fBgImage) fBgImage->release();
     fBgImage = b;
     rend = 1;
 }
 
-void FBalken::setFBgImage(Image* b) // copies into the completion background image
+void ProgressBar::setFBgImage(Image* b) // copies into the completion background image
 {
     if (!fBgImage) fBgImage = new Image();
     fBgImage->neuImage(b->getBreite(), b->getHeight(), 0);
@@ -122,13 +122,13 @@ void FBalken::setFBgImage(Image* b) // copies into the completion background ima
     rend = 1;
 }
 
-void FBalken::setTextRendererZ(TextRenderer* textRd)
+void ProgressBar::setTextRendererZ(TextRenderer* textRd)
 {
     if (this->textRd) this->textRd->release();
     this->textRd = textRd;
 }
 
-void FBalken::setFontZ(Font* s) // sets the font
+void ProgressBar::setFontZ(Font* s) // sets the font
 {
     if (!textRd)
         textRd = new TextRenderer(s);
@@ -137,19 +137,19 @@ void FBalken::setFontZ(Font* s) // sets the font
     rend = 1;
 }
 
-void FBalken::setSFarbe(int f) // sets the font color
+void ProgressBar::setSFarbe(int f) // sets the font color
 {
     schriftFarbe = f;
     rend = 1;
 }
 
-void FBalken::setSSize(unsigned char gr) // sets the font size
+void ProgressBar::setSSize(unsigned char gr) // sets the font size
 {
     schriftSize = gr;
     rend = 1;
 }
 
-void FBalken::render(Image& zRObj) // renders into zRObj
+void ProgressBar::render(Image& zRObj) // renders into zRObj
 {
     if (!hatStyle(Style::Sichtbar)) return;
     lockDrawable();
@@ -257,72 +257,72 @@ void FBalken::render(Image& zRObj) // renders into zRObj
 }
 
 // constant
-__int64 FBalken::getAktionAnzahl() const // returns the number of actions
+__int64 ProgressBar::getAktionAnzahl() const // returns the number of actions
 {
     return maxAk;
 }
 
-double FBalken::getProzent() const // returns the current percentage
+double ProgressBar::getProzent() const // returns the current percentage
 {
     if (!maxAk) return 0;
     return (double)ak / ((double)maxAk / 100.0);
 }
 
-__int64 FBalken::getAktion() const // returns the completed actions
+__int64 ProgressBar::getAktion() const // returns the completed actions
 {
     return ak;
 }
 
-Border* FBalken::getFBorder() const // returns the completion border
+Border* ProgressBar::getFBorder() const // returns the completion border
 {
     if (fBorder) return dynamic_cast<Border*>(fBorder->getThis());
     return 0;
 }
 
-Border* FBalken::zFBorder() const
+Border* ProgressBar::zFBorder() const
 {
     return fBorder;
 }
 
-AlphaFeld* FBalken::getFAlphaFeld() const // returns the completion AlphaFeld
+AlphaField* ProgressBar::getFAlphaField() const // returns the completion AlphaField
 {
-    if (fBuffer) return dynamic_cast<AlphaFeld*>(fBuffer->getThis());
+    if (fBuffer) return dynamic_cast<AlphaField*>(fBuffer->getThis());
     return 0;
 }
 
-AlphaFeld* FBalken::zFAlphaFeld() const
+AlphaField* ProgressBar::zFAlphaField() const
 {
     return fBuffer;
 }
 
-int FBalken::getFBgFarbe() const // returns the completion background color
+int ProgressBar::getFBgFarbe() const // returns the completion background color
 {
     return fBgF;
 }
 
-Image* FBalken::getFBgImage() const // returns the completion background image
+Image* ProgressBar::getFBgImage() const // returns the completion background image
 {
     if (fBgImage) return dynamic_cast<Image*>(fBgImage->getThis());
     return 0;
 }
 
-Image* FBalken::zFBgImage() const
+Image* ProgressBar::zFBgImage() const
 {
     return fBgImage;
 }
 
-Font* FBalken::getFont() const // returns the font
+Font* ProgressBar::getFont() const // returns the font
 {
     if (textRd) return textRd->getFont();
     return 0;
 }
 
-Font* FBalken::zFont() const
+Font* ProgressBar::zFont() const
 {
     return textRd ? textRd->zFont() : 0;
 }
 
-int FBalken::getSFarbe() const // returns the font color
+int ProgressBar::getSFarbe() const // returns the font color
 {
     return schriftFarbe;
 }

Progress.h

@@ -6,14 +6,14 @@
 namespace Framework
 {
     class Border;    //! Border.h
-    class AlphaFeld; //! AlphaField.h
+    class AlphaField; //! AlphaField.h
     class Image;      //! Image.h
     class Font;   //! Font.h
-    class FBalken;   //! from this file
+    class ProgressBar;   //! from this file
     class TextRenderer;
 
     //! A 2D GUI framework drawing that renders a progress bar
-    class FBalken : public DrawableBackground
+    class ProgressBar : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -59,7 +59,7 @@ namespace Framework
         __int64 maxAk;
         __int64 ak;
         Border* fBorder;
-        AlphaFeld* fBuffer;
+        AlphaField* fBuffer;
         int fBgF;
         Image* fBgImage;
         TextRenderer* textRd;
@@ -68,9 +68,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT FBalken();
+        DLLEXPORT ProgressBar();
         //! Destructor
-        DLLEXPORT virtual ~FBalken();
+        DLLEXPORT virtual ~ProgressBar();
         //! Sets the number of operations needed to reach 100% progress
         //! \param ak The number of operations
         DLLEXPORT void setAktionAnzahl(__int64 ak);
@@ -91,7 +91,7 @@ namespace Framework
         DLLEXPORT void setFRBreite(int br);
         //! Sets a pointer to the color gradient drawn in the progress-covered
         //! part of the bar \param af The color gradient
-        DLLEXPORT void setFAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setFAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient drawn in the progress-covered
         //! part of the bar \param f The color in A8R8G8B8 format
         DLLEXPORT void setFAFFarbe(int f);
@@ -133,10 +133,10 @@ namespace Framework
         //! progress-covered part of the bar
         DLLEXPORT Border* zFBorder() const;
         //! Returns the color gradient drawn in the progress-covered part of the bar
-        DLLEXPORT AlphaFeld* getFAlphaFeld() const;
+        DLLEXPORT AlphaField* getFAlphaField() const;
         //! Returns the color gradient without increased reference counter drawn
         //! in the progress-covered part of the bar
-        DLLEXPORT AlphaFeld* zFAlphaFeld() const;
+        DLLEXPORT AlphaField* zFAlphaField() const;
         //! Returns the background color in A8R8G8B8 format drawn in the
         //! progress-covered part of the bar
         DLLEXPORT int getFBgFarbe() const;

Random.h

@@ -5,7 +5,7 @@
 
 namespace Framework
 {
-    class Datei;
+    class File;
 
     class RandomGenerator : public virtual ReferenceCounter
     {

Reflection.h

@@ -6,6 +6,6 @@
     class NAME                                   \
     {                                            \
     public:                                      \
-        static const Klasse<NAME> klasse(#NAME); \
+        static const Class<NAME> klasse(#NAME); \
                                                  \
     private:

ReflectionExample.h

@@ -13,10 +13,10 @@ class AReflectableClass
 #define CLASS_NAME "AReflectableClass"
 
 public:
-    static Klasse klasse;
+    static Class klasse;
 
 private:
 };
 
-Klasse AReflectableClass::klasse = Klasse(CLASS_NAME);
+Class AReflectableClass::klasse = Class(CLASS_NAME);
 #undef CLASS_NAME

Regex.cpp

@@ -1,4 +1,4 @@
-#include "Regex.h"
+#include "Regex.h"
 
 using namespace Framework;
 using namespace Regex;
@@ -244,7 +244,7 @@ Automata<char>* parseCharacterList(Text* regex, RegexConfig& config)
 
 Automata<char>* concat(Array<Automata<char>*> parsers)
 {
-    if (parsers.getEintragAnzahl() == 0)
+    if (parsers.getEntryCount() == 0)
     {
         Automata<char>* result = new Automata<char>();
         State<char>* start = result->addState();
@@ -316,8 +316,8 @@ Automata<char>* parse(Text* regex, int& nextGroupId, RegexConfig& config)
         case '?':
             {
                 Automata<char>* last
-                    = results.get(results.getEintragAnzahl() - 1);
-                results.remove(results.getEintragAnzahl() - 1);
+                    = results.get(results.getEntryCount() - 1);
+                results.remove(results.getEntryCount() - 1);
                 results.add(maybe(last));
                 break;
             }
@@ -330,8 +330,8 @@ Automata<char>* parse(Text* regex, int& nextGroupId, RegexConfig& config)
                     i++;
                 }
                 Automata<char>* last
-                    = results.get(results.getEintragAnzahl() - 1);
-                results.remove(results.getEintragAnzahl() - 1);
+                    = results.get(results.getEntryCount() - 1);
+                results.remove(results.getEntryCount() - 1);
                 results.add(many(last, lazy));
                 break;
             }
@@ -344,8 +344,8 @@ Automata<char>* parse(Text* regex, int& nextGroupId, RegexConfig& config)
                     i++;
                 }
                 Automata<char>* last
-                    = results.get(results.getEintragAnzahl() - 1);
-                results.remove(results.getEintragAnzahl() - 1);
+                    = results.get(results.getEntryCount() - 1);
+                results.remove(results.getEntryCount() - 1);
                 results.add(atLeastOnce(last, lazy));
                 break;
             }
@@ -390,8 +390,8 @@ Automata<char>* parse(Text* regex, int& nextGroupId, RegexConfig& config)
                     max = min;
                 }
                 Automata<char>* last
-                    = results.get(results.getEintragAnzahl() - 1);
-                results.remove(results.getEintragAnzahl() - 1);
+                    = results.get(results.getEntryCount() - 1);
+                results.remove(results.getEntryCount() - 1);
                 results.add(repeat(last, min, max));
                 i = end;
                 subRegex->release();
@@ -547,7 +547,7 @@ Framework::Regex::Result::Result(Array<Group> groups)
 
 int Framework::Regex::Result::getGroupCount()
 {
-    return groups.getEintragAnzahl();
+    return groups.getEntryCount();
 }
 
 Group Framework::Regex::Result::getGroup(int index)

Regex.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <functional>
 
@@ -254,17 +254,17 @@ namespace Framework
                         groupEnds.add(current->getStrIndex());
                     }
                     if (current->zState()->getGroupStart()
-                        && groupEnds.getEintragAnzahl() > 0)
+                        && groupEnds.getEntryCount() > 0)
                     {
                         if (knownGroups.getWertIndex(
                                 current->zState()->getGroupStart())
                             < 0)
                         {
-                            while (groups.getEintragAnzahl()
+                            while (groups.getEntryCount()
                                    <= current->zState()->getGroupStart())
                             {
                                 groups.add(
-                                    Group(-1, -1, groups.getEintragAnzahl()));
+                                    Group(-1, -1, groups.getEntryCount()));
                             }
                             groups.set(Group(current->getStrIndex(),
                                            groupEnds.get(0),
@@ -308,7 +308,7 @@ namespace Framework
 
             State<Data>* addState()
             {
-                State<Data>* state = new State<Data>(states.getEintragAnzahl());
+                State<Data>* state = new State<Data>(states.getEntryCount());
                 states.add(state);
                 return state;
             }
@@ -371,7 +371,7 @@ namespace Framework
                     for (int i = currentFrame->getTransitionIndex();
                          i < currentFrame->zState()
                                  ->getTransitions()
-                                 .getEintragAnzahl();
+                                 .getEntryCount();
                          i++)
                     {
                         Transition<Data> t
@@ -432,7 +432,7 @@ namespace Framework
         {
             Automata<Data>* result = new Automata<Data>();
             State<Data>* start = result->addState();
-            int leftStateCount = left->getStates().getEintragAnzahl();
+            int leftStateCount = left->getStates().getEntryCount();
             for (State<Data>* leftState : left->getStates())
             {
                 if (leftState)
@@ -492,7 +492,7 @@ namespace Framework
         Automata<Data>* concat(Automata<Data>* left, Automata<Data>* right)
         {
             Automata<Data>* result = new Automata<Data>();
-            int leftStateCount = left->getStates().getEintragAnzahl();
+            int leftStateCount = left->getStates().getEntryCount();
             for (State<Data>* leftState : left->getStates())
             {
                 if (leftState)
@@ -731,7 +731,7 @@ namespace Framework
                 {
                     State<Data>* newState = result->getStates().z(
                         beforeState->getId()
-                        + before->getStates().getEintragAnzahl() * i);
+                        + before->getStates().getEntryCount() * i);
                     newState->setGroupStart(beforeState->getGroupStart());
                     newState->setGroupEnd(beforeState->getGroupEnd());
                     for (Transition<Data> transition :
@@ -741,7 +741,7 @@ namespace Framework
                             transition.getConditionFunction(),
                             result->getStates().z(
                                 transition.zTargetState()->getId()
-                                + before->getStates().getEintragAnzahl() * i),
+                                + before->getStates().getEntryCount() * i),
                             transition.getRequiredFlags()));
                     }
                 }
@@ -759,14 +759,14 @@ namespace Framework
                 {
                     State<Data>* newState = result->getStates().z(
                         beforeState->getId()
-                        + before->getStates().getEintragAnzahl() * i);
+                        + before->getStates().getEntryCount() * i);
                     if (beforeState->isFinal())
                     {
                         if (i < maxAmount - 1)
                         {
                             newState->addTransition(Transition<Data>(0,
                                 result->getStates().z(
-                                    before->getStates().getEintragAnzahl()
+                                    before->getStates().getEntryCount()
                                     * (i + 1)),
                                 0));
                         }

RenderThread.cpp

@@ -14,8 +14,8 @@ RenderTh::RenderTh()
     : Thread(),
       stoppen(0),
       bildschirm(0),
-      zeit(new ZeitMesser()),
-      renderTickZeit(1 / 60),
+      zeit(new Timer()),
+      renderTickTime(1 / 60),
       renderParameter(0),
       tickParameter(0),
       renderFunktion(0),
@@ -68,9 +68,9 @@ void RenderTh::thread() // Render loop
                     renderParameter, this, bildschirm->zRenderImage());
             bildschirm->render();
             val++;
-            if (tickFunktion) tickFunktion(tickParameter, this, renderTickZeit);
-            bildschirm->tick(renderTickZeit);
-            time += renderTickZeit;
+            if (tickFunktion) tickFunktion(tickParameter, this, renderTickTime);
+            bildschirm->tick(renderTickTime);
+            time += renderTickTime;
             unlock();
             if (time > 1)
             {
@@ -87,11 +87,11 @@ void RenderTh::thread() // Render loop
             unlock();
             Sleep(100);
         }
-        ausgleich += 1.0 / maxFps - renderTickZeit;
+        ausgleich += 1.0 / maxFps - renderTickTime;
         if (ausgleich > 0) Sleep((int)(ausgleich * 1000));
         zeit->messungEnde();
         zeit->messungStart();
-        renderTickZeit = zeit->getSekunden();
+        renderTickTime = zeit->getSekunden();
     }
     zeit->messungEnde();
 }
@@ -163,5 +163,5 @@ Screen* RenderTh::zScreen() const
 double RenderTh::getRenderTickZeit()
     const // returns the time needed for rendering and tick
 {
-    return renderTickZeit;
+    return renderTickTime;
 }

RenderThread.h

@@ -9,7 +9,7 @@
 namespace Framework
 {
     class Screen; //! Screen.h
-    class ZeitMesser; //! ZeitMesser.h
+    class Timer; //! Timer.h
     class Image;       //! Image.h
 
     //! A thread that manages a screen. It calls the render() and
@@ -19,8 +19,8 @@ namespace Framework
     private:
         bool stoppen;
         Screen* bildschirm;
-        ZeitMesser* zeit;
-        double renderTickZeit;
+        Timer* zeit;
+        double renderTickTime;
         void* renderParameter;
         void* tickParameter;
         std::function<void(void*, void*, Image*)> renderFunktion;

Screen.cpp

@@ -40,7 +40,7 @@ Screen::Screen(NativeWindow* f)
       renderOnTop(0),
       renderDrawables(1),
       rendering(0),
-      renderZeit(new ZeitMesser()),
+      renderTime(new Timer()),
       tips(new RCArray<ToolTip>()),
       testRend(1),
       fill(1),
@@ -57,7 +57,7 @@ Screen::~Screen()
 #endif
     members->release();
     tips->release();
-    renderZeit->release();
+    renderTime->release();
     if (onTop) onTop->release();
     if (api) api->release();
     unlock();
@@ -147,7 +147,7 @@ void Screen::addMember(Drawable* obj) // Adds a drawing
 void Screen::removeMember(Drawable* zObj) // Removes a drawing
 {
     lock();
-    for (int i = 0; i < members->getEintragAnzahl(); i++)
+    for (int i = 0; i < members->getEntryCount(); i++)
     {
         if (members->z(i) == zObj) members->remove(i);
     }
@@ -222,7 +222,7 @@ void Screen::setBackBufferSize(Punkt& size)
     unlock();
 }
 
-void Screen::doMausEreignis(MausEreignis& me) // sends mouse event
+void Screen::doMouseEvent(MouseEvent& me) // sends mouse event
 {
     int fBr = api->getBackBufferSize().x;
     int fHi = api->getBackBufferSize().y;
@@ -240,36 +240,36 @@ void Screen::doMausEreignis(MausEreignis& me) // sends mouse event
     {
         for (ArrayIterator<ToolTip*> i = tips->begin(); i; i++)
         {
-            i->doPublicMausEreignis(me);
+            i->doPublicMouseEvent(me);
             if (i->getReferenceCount() == 1) i.remove();
         }
-        for (int i = members->getEintragAnzahl() - 1; i >= 0; i--)
-            members->z(i)->doPublicMausEreignis(me);
+        for (int i = members->getEntryCount() - 1; i >= 0; i--)
+            members->z(i)->doPublicMouseEvent(me);
     }
     else if (onTop)
     {
-        onTop->doPublicMausEreignis(me);
+        onTop->doPublicMouseEvent(me);
         for (ArrayIterator<ToolTip*> i = tips->begin(); i; i++)
         {
-            i->doPublicMausEreignis(me);
+            i->doPublicMouseEvent(me);
             if (i->getReferenceCount() == 1) i.remove();
         }
     }
     unlock();
 }
 
-void Screen::doTastaturEreignis(
-TastaturEreignis& te) // sends keyboard event
+void Screen::doKeyboardEvent(
+KeyboardEvent& te) // sends keyboard event
 {
     lock();
     if (!renderOnTop)
     {
-        for (int i = members->getEintragAnzahl() - 1; i >= 0; i--)
-            members->z(i)->doTastaturEreignis(te);
+        for (int i = members->getEntryCount() - 1; i >= 0; i--)
+            members->z(i)->doKeyboardEvent(te);
     }
     for (ArrayIterator<ToolTip*> i = tips->begin(); i; i++)
     {
-        i->doTastaturEreignis(te);
+        i->doKeyboardEvent(te);
         if (i->getReferenceCount() == 1) i.remove();
     }
     unlock();
@@ -327,7 +327,7 @@ void Screen::warteAufRendern() const // waits for the render function
 double Screen::getRenderZeit()
 const // returns how many seconds rendering takes
 {
-    return renderZeit->getSekunden();
+    return renderTime->getSekunden();
 }
 
 // Returns the graphics API (without increased reference counter)
@@ -381,7 +381,7 @@ Monitor Framework::getMonitor(int id)
     dispDev.cb = sizeof(dispDev);
     EnumDisplayDevices(NULL, id, &dispDev, 0);
     EnumDisplayMonitors(0, 0, (MONITORENUMPROC)MonitorEnum, (LPARAM)monitore);
-    int anz = monitore->getEintragAnzahl();
+    int anz = monitore->getEntryCount();
     Monitor result;
     result.existiert = 0;
     result = *monitore->get(id);
@@ -415,7 +415,7 @@ void Screen2D::render() // Draws the image
     if (ui)
     {
         lock();
-        renderZeit->messungStart();
+        renderTime->messungStart();
         api->beginFrame(fill && (rend || !testRend), 0, fillColor);
         if (renderDrawables)
         {
@@ -443,7 +443,7 @@ void Screen2D::render() // Draws the image
         }
         if (renderOnTop && onTop) onTop->render(*ui);
         api->presentFrame();
-        renderZeit->messungEnde();
+        renderTime->messungEnde();
         unlock();
     }
     rendering = 0;
@@ -454,7 +454,7 @@ void Screen2D::render() // Draws the image
 // Constructor
 Screen3D::Screen3D(NativeWindow* fenster)
     : Screen(fenster),
-      kameras(new RCArray<Kam3D>()),
+      kameras(new RCArray<Cam3D>()),
       rend3D(0)
 {
     if (DirectX12::isAvailable())
@@ -470,7 +470,7 @@ Screen3D::Screen3D(NativeWindow* fenster)
 
 Screen3D::Screen3D(NativeWindow* fenster, GraphicApiType apiTyp)
     : Screen(fenster),
-      kameras(new RCArray<Kam3D>()),
+      kameras(new RCArray<Cam3D>()),
       rend3D(0)
 {
     if (apiTyp == DIRECTX9) api = new DirectX9();
@@ -483,7 +483,7 @@ Screen3D::Screen3D(NativeWindow* fenster, GraphicApiType apiTyp)
 
 Screen3D::Screen3D(NativeWindow* fenster, GraphicsApi* api)
     : Screen(fenster),
-      kameras(new RCArray<Kam3D>()),
+      kameras(new RCArray<Cam3D>()),
       rend3D(0)
 {
     this->api = api;
@@ -499,7 +499,7 @@ Screen3D::~Screen3D()
 }
 
 // non-constant
-void Screen3D::addKamera(Kam3D* obj) // Adds a camera
+void Screen3D::addKamera(Cam3D* obj) // Adds a camera
 {
     lock();
     kameras->add(obj);
@@ -507,7 +507,7 @@ void Screen3D::addKamera(Kam3D* obj) // Adds a camera
     unlock();
 }
 
-void Screen3D::removeKamera(Kam3D* zObj) // Removes a camera
+void Screen3D::removeKamera(Cam3D* zObj) // Removes a camera
 {
     lock();
     for (int i = 0; kameras->z(i); i++)
@@ -526,33 +526,33 @@ void Screen3D::tick(double tickval)
 {
     lock();
     __super::tick(tickval);
-    for (Kam3D* k : *kameras)
+    for (Cam3D* k : *kameras)
         rend3D |= k->tick(tickval);
     unlock();
     if (handleUserInputsOnTick)
     {
         queueCs.lock();
-        while (meQueue.getEintragAnzahl() > 0)
+        while (meQueue.getEntryCount() > 0)
         {
-            MausEreignis me = meQueue.get(0);
-            __super::doMausEreignis(me);
-            for (int i = kameras->getEintragAnzahl() - 1; i >= 0; i--)
-                kameras->z(i)->doMausEreignis(me);
+            MouseEvent me = meQueue.get(0);
+            __super::doMouseEvent(me);
+            for (int i = kameras->getEntryCount() - 1; i >= 0; i--)
+                kameras->z(i)->doMouseEvent(me);
             meQueue.remove(0);
         }
-        while (teQueue.getEintragAnzahl() > 0)
+        while (teQueue.getEntryCount() > 0)
         {
-            TastaturEreignis te = teQueue.get(0);
-            __super::doTastaturEreignis(te);
-            for (int i = kameras->getEintragAnzahl() - 1; i >= 0; i--)
-                kameras->z(i)->doTastaturEreignis(te);
+            KeyboardEvent te = teQueue.get(0);
+            __super::doKeyboardEvent(te);
+            for (int i = kameras->getEntryCount() - 1; i >= 0; i--)
+                kameras->z(i)->doKeyboardEvent(te);
             teQueue.remove(0);
         }
         queueCs.unlock();
     }
 }
 
-void Screen3D::doMausEreignis(MausEreignis& me) // sends mouse event
+void Screen3D::doMouseEvent(MouseEvent& me) // sends mouse event
 {
     if (handleUserInputsOnTick)
     {
@@ -563,15 +563,15 @@ void Screen3D::doMausEreignis(MausEreignis& me) // sends mouse event
     else
     {
         lock();
-        __super::doMausEreignis(me);
-        for (int i = kameras->getEintragAnzahl() - 1; i >= 0; i--)
-            kameras->z(i)->doMausEreignis(me);
+        __super::doMouseEvent(me);
+        for (int i = kameras->getEntryCount() - 1; i >= 0; i--)
+            kameras->z(i)->doMouseEvent(me);
         unlock();
     }
 }
 
-void Screen3D::doTastaturEreignis(
-TastaturEreignis& te) // sends keyboard event
+void Screen3D::doKeyboardEvent(
+KeyboardEvent& te) // sends keyboard event
 {
     if (handleUserInputsOnTick)
     {
@@ -582,9 +582,9 @@ TastaturEreignis& te) // sends keyboard event
     else
     {
         lock();
-        __super::doTastaturEreignis(te);
-        for (int i = kameras->getEintragAnzahl() - 1; i >= 0; i--)
-            kameras->z(i)->doTastaturEreignis(te);
+        __super::doKeyboardEvent(te);
+        for (int i = kameras->getEntryCount() - 1; i >= 0; i--)
+            kameras->z(i)->doKeyboardEvent(te);
         unlock();
     }
 }
@@ -593,7 +593,7 @@ void Screen3D::render() // Draws the image
 {
     rendering = 1;
     lock();
-    renderZeit->messungStart();
+    renderTime->messungStart();
     // Clear the back buffer.
     api->beginFrame(fill && (rend || !testRend),
         fill && (rend3D || !testRend || rend),
@@ -601,7 +601,7 @@ void Screen3D::render() // Draws the image
     if (rend3D || !testRend || rend)
     {
         // Render 3d Objects
-        for (Kam3D* k : *kameras)
+        for (Cam3D* k : *kameras)
             api->renderKamera(k);
         rend3D = 0;
     }
@@ -637,9 +637,9 @@ void Screen3D::render() // Draws the image
     }
     api->presentFrame();
     unlock();
-    renderZeit->messungEnde();
+    renderTime->messungEnde();
 #    ifdef _DEBUG
-    // Logging::trace() << renderZeit->getSekunden() << "\n";
+    // Logging::trace() << renderTime->getSekunden() << "\n";
 #    endif
     rendering = 0;
     rend = 0;

Screen.h

@@ -38,18 +38,18 @@ namespace Framework
     class Screen;        //! from this file
     class Drawable;         //! Drawing.h
     class Drawable3D;       //! Drawing3D.h
-    class ZeitMesser;        //! Time.h
-    struct MausEreignis;     //! MouseEvent.h
-    struct TastaturEreignis; //! KeyboardEvent.h
+    class Timer;        //! Time.h
+    struct MouseEvent;     //! MouseEvent.h
+    struct KeyboardEvent; //! KeyboardEvent.h
     class ToolTip;           //! Tooltip.h
     class PixelShader;       //! Shader.h
     class VertexShader;      //! Shader.h
-    class Kam3D;             //! Camera3D.h
+    class Cam3D;             //! Camera3D.h
     class Render3D;          //! Render3D.h
     class DXVertexBuffer;    //! DXBuffer.h
     class DXIndexBuffer;     //! DXBuffer.h
-    class Textur;            //! Texture.h
-    class TexturModel;       //! TextureModel.h
+    class Texture;            //! Texture.h
+    class TextureModel;       //! TextureModel.h
     class GraphicsApi;       //! GraphicsApi.h
     class DirectX9;          //! GraphicsApi.h
 
@@ -83,7 +83,7 @@ namespace Framework
         bool renderOnTop;
         bool renderDrawables;
         bool rendering;
-        ZeitMesser* renderZeit;
+        Timer* renderTime;
         Critical cs;
         RCArray<ToolTip>* tips;
         bool testRend;
@@ -91,8 +91,8 @@ namespace Framework
         bool rend;
         bool handleUserInputsOnTick;
         Critical queueCs;
-        Array<MausEreignis> meQueue;
-        Array<TastaturEreignis> teQueue;
+        Array<MouseEvent> meQueue;
+        Array<KeyboardEvent> teQueue;
         std::queue<std::function<void()>> actions;
 
     public:
@@ -148,7 +148,7 @@ namespace Framework
         //! setRenderDrawables(1) was set. \param obj The drawing
         DLLEXPORT virtual void addMember(Drawable* obj);
         //! Removes a drawing from the image. Must not be called while
-        //! doMausEreignis(), doTastaturEreignis(), tick() or render() is
+        //! doMouseEvent(), doKeyboardEvent(), tick() or render() is
         //! being called. \param obj The drawing (without increased reference
         //! counter)
         DLLEXPORT virtual void removeMember(Drawable* zObj);
@@ -176,11 +176,11 @@ namespace Framework
         //! Processes a mouse event. Called automatically by the framework.
         //! Passes the event to all drawings in the image
         //! \param me The event
-        DLLEXPORT virtual void doMausEreignis(MausEreignis& me);
+        DLLEXPORT virtual void doMouseEvent(MouseEvent& me);
         //! Processes a keyboard event. Called automatically by the framework.
         //! Passes the event to all drawings in the image
         //! \param te The event
-        DLLEXPORT virtual void doTastaturEreignis(TastaturEreignis& te);
+        DLLEXPORT virtual void doKeyboardEvent(KeyboardEvent& te);
         //! Adds a tooltip.
         //! \param tip The tooltip
         DLLEXPORT virtual void addToolTip(ToolTip* tip);
@@ -226,7 +226,7 @@ namespace Framework
     class Screen3D : public Screen
     {
     private:
-        RCArray<Kam3D>* kameras;
+        RCArray<Cam3D>* kameras;
         bool rend3D;
 
     public:
@@ -239,9 +239,9 @@ namespace Framework
         DLLEXPORT virtual ~Screen3D();
         //! Adds a camera to the screen
         //! \param obj The camera
-        DLLEXPORT void addKamera(Kam3D* obj);
+        DLLEXPORT void addKamera(Cam3D* obj);
         //! Removes a camera from the screen
-        DLLEXPORT void removeKamera(Kam3D* zObj);
+        DLLEXPORT void removeKamera(Cam3D* zObj);
         //! Processes the time elapsed since the last call of this function.
         //! Calls the tick functions of all drawings and cameras in the image
         //! \param tickval The elapsed time in seconds
@@ -249,11 +249,11 @@ namespace Framework
         //! Processes a mouse event. Called automatically by the framework.
         //! Passes the event to all drawings and cameras in the image
         //! \param me The event
-        DLLEXPORT void doMausEreignis(MausEreignis& me);
+        DLLEXPORT void doMouseEvent(MouseEvent& me);
         //! Processes a keyboard event. Called automatically by the framework.
         //! Passes the event to all drawings and cameras in the image
         //! \param te The event
-        DLLEXPORT void doTastaturEreignis(TastaturEreignis& te);
+        DLLEXPORT void doKeyboardEvent(KeyboardEvent& te);
         //! Draws an image and presents it on the screen
         DLLEXPORT void render();
     };

Scroll.cpp

@@ -135,7 +135,7 @@ VScrollBar::VScrollBar()
 // Destructor
 VScrollBar::~VScrollBar() {}
 
-bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MausEreignis& me)
+bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
 {
     if (me.id == ME_Leaves)
     {
@@ -235,7 +235,7 @@ HScrollBar::HScrollBar()
 HScrollBar::~HScrollBar() {}
 
 // non-constant
-bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MausEreignis& me)
+bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
 {
     if (me.id == ME_Leaves)
     {

Scroll.h

@@ -7,7 +7,7 @@
 namespace Framework
 {
     class Image;          //! Image.h
-    struct MausEreignis; //! MouseEvent.h
+    struct MouseEvent; //! MouseEvent.h
 
     struct ScrollData
     {
@@ -61,7 +61,7 @@ namespace Framework
         //! \return 1 if the message was processed. Does not set the
         //! processed flag of the mouse event
         DLLEXPORT virtual bool doMausMessage(
-            int x, int y, int br, int hi, MausEreignis& me)
+            int x, int y, int br, int hi, MouseEvent& me)
             = 0;
         //! Returns whether the scrollbar has changed since the last call of
         //! this function
@@ -103,7 +103,7 @@ namespace Framework
         //! \return 1 if the message was processed. Does not set the
         //! processed flag of the mouse event
         DLLEXPORT bool doMausMessage(
-            int x, int y, int br, int hi, MausEreignis& me) override;
+            int x, int y, int br, int hi, MouseEvent& me) override;
         //! Draws the scrollbar
         //! \param x The X position of the scroll bar
         //! \param y The Y position of the scroll bar
@@ -131,7 +131,7 @@ namespace Framework
         //! \return 1 if the message was processed. Does not set the
         //! processed flag of the mouse event
         DLLEXPORT bool doMausMessage(
-            int x, int y, int br, int hi, MausEreignis& me) override;
+            int x, int y, int br, int hi, MouseEvent& me) override;
         //! Draws the scrollbar
         //! \param x The X position of the scroll bar
         //! \param y The Y position of the scroll bar

SelectionBox.cpp

@@ -14,18 +14,18 @@
 
 using namespace Framework;
 
-// Contents of the AuswahlBox class from SelectionBox.h
+// Contents of the SelectionBox class from SelectionBox.h
 // Constructor
-AuswahlBox::AuswahlBox()
+SelectionBox::SelectionBox()
     : DrawableBackground(),
       textRd(0),
       msStyle(0),
       members(new RCArray<TextField>()),
-      ausfahren(new Knopf()),
+      ausfahren(new Button()),
       selBorder(new LBorder()),
       auswBgF(0xFF000000),
       auswBgB(0),
-      auswAf(new AlphaFeld()),
+      auswAf(new AlphaField()),
       msSelBorder(0),
       msAuswBgF(0),
       msAuswBgB(0),
@@ -33,7 +33,7 @@ AuswahlBox::AuswahlBox()
       mouseBorder(new LBorder()),
       mausBgF(0xFF000000),
       mausBgB(0),
-      mausAf(new AlphaFeld()),
+      mausAf(new AlphaField()),
       msMouseBorder(0),
       msMausBgF(0),
       msMausBgB(0),
@@ -55,8 +55,8 @@ AuswahlBox::AuswahlBox()
     rahmen = new LBorder();
     rahmen->setFarbe(0xFFFFFFFF);
     rahmen->setRamenBreite(1);
-    ausfahren->setStyle(Knopf::Style::Sichtbar | Knopf::Style::Erlaubt
-                        | Knopf::Style::KlickBuffer);
+    ausfahren->setStyle(Button::Style::Sichtbar | Button::Style::Erlaubt
+                        | Button::Style::KlickBuffer);
     ausfahren->setKBFarbe(0xA0000000);
     ausfahren->setKBStrength(10);
     ausfahren->setSize(18, 18);
@@ -75,7 +75,7 @@ AuswahlBox::AuswahlBox()
 }
 
 // Destructor
-AuswahlBox::~AuswahlBox()
+SelectionBox::~SelectionBox()
 {
     if (textRd) textRd->release();
     if (msStyle) msStyle->release();
@@ -97,7 +97,7 @@ AuswahlBox::~AuswahlBox()
     if (msMausBgF) msMausBgF->release();
 }
 
-void AuswahlBox::doMausEreignis(MausEreignis& me, bool userRet) // mouse events
+void SelectionBox::doMouseEvent(MouseEvent& me, bool userRet) // mouse events
 {
     if (hatStyleNicht(Style::Erlaubt) || hatStyleNicht(Style::Fokus)
         || me.verarbeitet)
@@ -118,7 +118,7 @@ void AuswahlBox::doMausEreignis(MausEreignis& me, bool userRet) // mouse events
         int tmpMy = me.my;
         if (me.mx >= 0 && me.my >= 0 && me.mx < gr.x && me.my < gr.y)
             me.mx = ausfahren->getX(), me.my = ausfahren->getY() + 1;
-        ausfahren->doPublicMausEreignis(me);
+        ausfahren->doPublicMouseEvent(me);
         me.mx = tmpMx, me.my = tmpMy;
     }
     if (me.verarbeitet && !vera && me.id == ME_RLinks)
@@ -194,18 +194,18 @@ void AuswahlBox::doMausEreignis(MausEreignis& me, bool userRet) // mouse events
 }
 
 // non-constant
-void AuswahlBox::setEventParam(void* p) // set event parameter
+void SelectionBox::setEventParam(void* p) // set event parameter
 {
     eAkP = p;
 }
 
-void AuswahlBox::setEventAktion(
-    std::function<void(void*, AuswahlBox*, int, int)> event) // set event action
+void SelectionBox::setEventAktion(
+    std::function<void(void*, SelectionBox*, int, int)> event) // set event action
 {
     this->eAk = event;
 }
 
-void AuswahlBox::setFontZ(Font* schrift) // set font
+void SelectionBox::setFontZ(Font* schrift) // set font
 {
     if (!this->textRd)
         textRd = new TextRenderer(schrift);
@@ -215,13 +215,13 @@ void AuswahlBox::setFontZ(Font* schrift) // set font
     rend = 1;
 }
 
-void AuswahlBox::setTextRendererZ(TextRenderer* textRd)
+void SelectionBox::setTextRendererZ(TextRenderer* textRd)
 {
     if (this->textRd) this->textRd->release();
     this->textRd = textRd;
 }
 
-void AuswahlBox::addEintrag(const char* txt) // add entry
+void SelectionBox::addEintrag(const char* txt) // add entry
 {
     TextField* tf = new TextField();
     if (textRd) tf->setFontZ(textRd->getFont());
@@ -236,7 +236,7 @@ void AuswahlBox::addEintrag(const char* txt) // add entry
     rend = 1;
 }
 
-void AuswahlBox::addEintrag(Text* txt)
+void SelectionBox::addEintrag(Text* txt)
 {
     TextField* tf = new TextField();
     if (textRd) tf->setFontZ(textRd->getFont());
@@ -251,20 +251,20 @@ void AuswahlBox::addEintrag(Text* txt)
     rend = 1;
 }
 
-void AuswahlBox::addEintragZ(TextField* txt)
+void SelectionBox::addEintragZ(TextField* txt)
 {
     members->add(txt, anzahl);
     ++anzahl;
     rend = 1;
 }
 
-void AuswahlBox::setEintrag(int i, const char* txt) // set entry text
+void SelectionBox::setEintrag(int i, const char* txt) // set entry text
 {
     if (members->z(i)) members->z(i)->setText(txt);
     rend = 1;
 }
 
-void AuswahlBox::setEintrag(int i, Text* txt)
+void SelectionBox::setEintrag(int i, Text* txt)
 {
     if (members->z(i))
         members->z(i)->setText(txt);
@@ -273,7 +273,7 @@ void AuswahlBox::setEintrag(int i, Text* txt)
     rend = 1;
 }
 
-void AuswahlBox::setEintragZ(int i, TextField* txt)
+void SelectionBox::setEintragZ(int i, TextField* txt)
 {
     if (i < anzahl)
         members->set(txt, i);
@@ -282,7 +282,7 @@ void AuswahlBox::setEintragZ(int i, TextField* txt)
     rend = 1;
 }
 
-void AuswahlBox::removeEintrag(int i) // remove entry
+void SelectionBox::removeEintrag(int i) // remove entry
 {
     if (i < anzahl)
     {
@@ -303,14 +303,14 @@ void AuswahlBox::removeEintrag(int i) // remove entry
     }
 }
 
-void AuswahlBox::setAusklappKnopfZ(Knopf* ausK) // set expand button
+void SelectionBox::setDropDownButtonZ(Button* ausK) // set expand button
 {
     if (ausfahren) ausfahren->release();
     ausfahren = ausK;
     rend = 1;
 }
 
-void AuswahlBox::setEntryBorderZ(int i, Border* rahmen) // set entry border
+void SelectionBox::setEntryBorderZ(int i, Border* rahmen) // set entry border
 {
     if (members->z(i))
         members->z(i)->setBorderZ(rahmen);
@@ -319,27 +319,27 @@ void AuswahlBox::setEntryBorderZ(int i, Border* rahmen) // set entry border
     rend = 1;
 }
 
-void AuswahlBox::setEintragRahmenFarbe(int i, int f) // set entry border color
+void SelectionBox::setEintragRahmenFarbe(int i, int f) // set entry border color
 {
     if (members->z(i)) members->z(i)->setBorderColor(f);
     rend = 1;
 }
 
-void AuswahlBox::setEintragRahmenBreite(
+void SelectionBox::setEintragRahmenBreite(
     int i, int rbr) // set entry border width
 {
     if (members->z(i)) members->z(i)->setBorderWidth(rbr);
     rend = 1;
 }
 
-void AuswahlBox::setEintragHintergrundFarbe(
+void SelectionBox::setEintragHintergrundFarbe(
     int i, int f) // set entry background color
 {
     if (members->z(i)) members->z(i)->setHintergrundFarbe(f);
     rend = 1;
 }
 
-void AuswahlBox::setEintragHintergrundImageZ(
+void SelectionBox::setEintragHintergrundImageZ(
     int i, Image* bgB) // set entry background image
 {
     if (members->z(i))
@@ -349,7 +349,7 @@ void AuswahlBox::setEintragHintergrundImageZ(
     rend = 1;
 }
 
-void AuswahlBox::setEintragHintergrundImage(int i, Image* bgB)
+void SelectionBox::setEintragHintergrundImage(int i, Image* bgB)
 {
     if (members->z(i))
         members->z(i)->setHintergrundImage(bgB);
@@ -358,56 +358,56 @@ void AuswahlBox::setEintragHintergrundImage(int i, Image* bgB)
     rend = 1;
 }
 
-void AuswahlBox::setEintragAlphaFeldZ(
-    int i, AlphaFeld* af) // set entry AlphaFeld
+void SelectionBox::setEntryAlphaFieldZ(
+    int i, AlphaField* af) // set entry AlphaField
 {
-    if (members->z(i)) members->z(i)->setAlphaFeldZ(af);
+    if (members->z(i)) members->z(i)->setAlphaFieldZ(af);
     rend = 1;
 }
 
-void AuswahlBox::setEintragAlphaFeldFarbe(
-    int i, int afF) // set entry AlphaFeld color
+void SelectionBox::setEintragAlphaFeldFarbe(
+    int i, int afF) // set entry AlphaField color
 {
-    if (members->z(i)) members->z(i)->setAlphaFeldFarbe(afF);
+    if (members->z(i)) members->z(i)->setAlphaFieldColor(afF);
     rend = 1;
 }
 
-void AuswahlBox::setEintragAlphaFeldStrength(
-    int i, int afSt) // set entry AlphaFeld strength
+void SelectionBox::setEintragAlphaFeldStrength(
+    int i, int afSt) // set entry AlphaField strength
 {
-    if (members->z(i)) members->z(i)->setAlphaFeldStrength(afSt);
+    if (members->z(i)) members->z(i)->setAlphaFieldStrength(afSt);
     rend = 1;
 }
 
-void AuswahlBox::setSelBorderZ(Border* rahmen) // set selection border
+void SelectionBox::setSelBorderZ(Border* rahmen) // set selection border
 {
     if (selBorder) selBorder->release();
     selBorder = rahmen;
     rend = 1;
 }
 
-void AuswahlBox::setAuswRahmenFarbe(int f) // set selection border color
+void SelectionBox::setAuswRahmenFarbe(int f) // set selection border color
 {
     if (!selBorder) selBorder = new LBorder();
     selBorder->setFarbe(f);
     rend = 1;
 }
 
-void AuswahlBox::setAuswRahmenBreite(int rbr) // set selection border width
+void SelectionBox::setAuswRahmenBreite(int rbr) // set selection border width
 {
     if (!selBorder) selBorder = new LBorder();
     selBorder->setRamenBreite(rbr);
     rend = 1;
 }
 
-void AuswahlBox::setAuswHintergrundFarbe(
+void SelectionBox::setAuswHintergrundFarbe(
     int f) // set selection background color
 {
     auswBgF = f;
     rend = 1;
 }
 
-void AuswahlBox::setAuswHintergrundImageZ(
+void SelectionBox::setAuswHintergrundImageZ(
     Image* bgB) // set selection background image
 {
     if (auswBgB) auswBgB->release();
@@ -415,7 +415,7 @@ void AuswahlBox::setAuswHintergrundImageZ(
     rend = 1;
 }
 
-void AuswahlBox::setAuswHintergrundImage(Image* bgB)
+void SelectionBox::setAuswHintergrundImage(Image* bgB)
 {
     if (!auswBgB) auswBgB = new Image();
     auswBgB->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
@@ -424,29 +424,29 @@ void AuswahlBox::setAuswHintergrundImage(Image* bgB)
     rend = 1;
 }
 
-void AuswahlBox::setAuswAlphaFeldZ(AlphaFeld* af) // set selection AlphaFeld
+void SelectionBox::setSelAlphaFieldZ(AlphaField* af) // set selection AlphaField
 {
     if (auswAf) auswAf->release();
     auswAf = af;
     rend = 1;
 }
 
-void AuswahlBox::setAuswAlphaFeldFarbe(int afF) // set selection AlphaFeld color
+void SelectionBox::setSelAlphaFieldColor(int afF) // set selection AlphaField color
 {
-    if (!auswAf) auswAf = new AlphaFeld();
+    if (!auswAf) auswAf = new AlphaField();
     auswAf->setFarbe(afF);
     rend = 1;
 }
 
-void AuswahlBox::setAuswAlphaFeldStrength(
-    int afSt) // set selection AlphaFeld strength
+void SelectionBox::setAuswAlphaFeldStrength(
+    int afSt) // set selection AlphaField strength
 {
-    if (!auswAf) auswAf = new AlphaFeld();
+    if (!auswAf) auswAf = new AlphaField();
     auswAf->setStrength(afSt);
     rend = 1;
 }
 
-void AuswahlBox::setMsSelBorderZ(
+void SelectionBox::setMsSelBorderZ(
     int i, Border* rahmen) // set multistyle selection border
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
@@ -459,7 +459,7 @@ void AuswahlBox::setMsSelBorderZ(
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswRahmenFarbe(
+void SelectionBox::setMsAuswRahmenFarbe(
     int i, int f) // set multistyle selection border color
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
@@ -469,7 +469,7 @@ void AuswahlBox::setMsAuswRahmenFarbe(
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswRahmenBreite(
+void SelectionBox::setMsAuswRahmenBreite(
     int i, int rbr) // set multistyle selection width
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
@@ -479,7 +479,7 @@ void AuswahlBox::setMsAuswRahmenBreite(
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswHintergrundFarbe(
+void SelectionBox::setMsAuswHintergrundFarbe(
     int i, int f) // set multistyle selection background color
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
@@ -488,7 +488,7 @@ void AuswahlBox::setMsAuswHintergrundFarbe(
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswHintergrundImageZ(
+void SelectionBox::setMsAuswHintergrundImageZ(
     int i, Image* bgB) // set multistyle selection background image
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
@@ -501,7 +501,7 @@ void AuswahlBox::setMsAuswHintergrundImageZ(
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswHintergrundImage(int i, Image* bgB)
+void SelectionBox::setMsAuswHintergrundImage(int i, Image* bgB)
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
@@ -526,67 +526,67 @@ void AuswahlBox::setMsAuswHintergrundImage(int i, Image* bgB)
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswAlphaFeldZ(
-    int i, AlphaFeld* af) // set multistyle selection AlphaFeld
+void SelectionBox::setMsSelAlphaFieldZ(
+    int i, AlphaField* af) // set multistyle selection AlphaField
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
         af->release();
         return;
     }
-    if (!msAuswAf) msAuswAf = new RCArray<AlphaFeld>();
+    if (!msAuswAf) msAuswAf = new RCArray<AlphaField>();
     msAuswAf->set(af, i);
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswAlphaFeldFarbe(
-    int i, int afF) // set multistyle selection AlphaFeld color
+void SelectionBox::setMsAuswAlphaFeldFarbe(
+    int i, int afF) // set multistyle selection AlphaField color
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msAuswAf) msAuswAf = new RCArray<AlphaFeld>();
-    if (!msAuswAf->z(i)) msAuswAf->set(new AlphaFeld(), i);
+    if (!msAuswAf) msAuswAf = new RCArray<AlphaField>();
+    if (!msAuswAf->z(i)) msAuswAf->set(new AlphaField(), i);
     msAuswAf->z(i)->setFarbe(afF);
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswAlphaFeldStrength(
-    int i, int afSt) // set multistyle selection AlphaFeld strength
+void SelectionBox::setMsAuswAlphaFeldStrength(
+    int i, int afSt) // set multistyle selection AlphaField strength
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msAuswAf) msAuswAf = new RCArray<AlphaFeld>();
-    if (!msAuswAf->z(i)) msAuswAf->set(new AlphaFeld(), i);
+    if (!msAuswAf) msAuswAf = new RCArray<AlphaField>();
+    if (!msAuswAf->z(i)) msAuswAf->set(new AlphaField(), i);
     msAuswAf->z(i)->setStrength(afSt);
     rend = 1;
 }
 
-void AuswahlBox::setMouseBorderZ(Border* rahmen) // set mouse border
+void SelectionBox::setMouseBorderZ(Border* rahmen) // set mouse border
 {
     if (mouseBorder) mouseBorder->release();
     mouseBorder = rahmen;
     rend = 1;
 }
 
-void AuswahlBox::setMausRahmenFarbe(int f) // set mouse border color
+void SelectionBox::setMausRahmenFarbe(int f) // set mouse border color
 {
     if (!mouseBorder) mouseBorder = new LBorder();
     mouseBorder->setFarbe(f);
     rend = 1;
 }
 
-void AuswahlBox::setMausRahmenBreite(int rbr) // set mouse border width
+void SelectionBox::setMausRahmenBreite(int rbr) // set mouse border width
 {
     if (!mouseBorder) mouseBorder = new LBorder();
     mouseBorder->setRamenBreite(rbr);
     rend = 1;
 }
 
-void AuswahlBox::setMausHintergrundFarbe(int f) // set mouse background color
+void SelectionBox::setMausHintergrundFarbe(int f) // set mouse background color
 {
     mausBgF = f;
     rend = 1;
 }
 
-void AuswahlBox::setMausHintergrundImageZ(
+void SelectionBox::setMausHintergrundImageZ(
     Image* bgB) // set mouse background image
 {
     if (mausBgB) mausBgB->release();
@@ -594,7 +594,7 @@ void AuswahlBox::setMausHintergrundImageZ(
     rend = 1;
 }
 
-void AuswahlBox::setMausHintergrundImage(Image* bgB)
+void SelectionBox::setMausHintergrundImage(Image* bgB)
 {
     if (!mausBgB) mausBgB = new Image();
     mausBgB->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
@@ -603,29 +603,29 @@ void AuswahlBox::setMausHintergrundImage(Image* bgB)
     rend = 1;
 }
 
-void AuswahlBox::setMausAlphaFeldZ(AlphaFeld* af) // set mouse AlphaFeld
+void SelectionBox::setMouseAlphaFieldZ(AlphaField* af) // set mouse AlphaField
 {
     if (mausAf) mausAf->release();
     mausAf = af;
     rend = 1;
 }
 
-void AuswahlBox::setMausAlphaFeldFarbe(int afF) // set mouse AlphaFeld color
+void SelectionBox::setMouseAlphaFieldColor(int afF) // set mouse AlphaField color
 {
-    if (!mausAf) mausAf = new AlphaFeld();
+    if (!mausAf) mausAf = new AlphaField();
     mausAf->setFarbe(afF);
     rend = 1;
 }
 
-void AuswahlBox::setMausAlphaFeldStrength(
-    int afSt) // set mouse AlphaFeld strength
+void SelectionBox::setMausAlphaFeldStrength(
+    int afSt) // set mouse AlphaField strength
 {
-    if (!mausAf) mausAf = new AlphaFeld();
+    if (!mausAf) mausAf = new AlphaField();
     mausAf->setStrength(afSt);
     rend = 1;
 }
 
-void AuswahlBox::setMsMouseBorderZ(
+void SelectionBox::setMsMouseBorderZ(
     int i, Border* rahmen) // set multistyle mouse border
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
@@ -638,7 +638,7 @@ void AuswahlBox::setMsMouseBorderZ(
     rend = 1;
 }
 
-void AuswahlBox::setMsMausRahmenFarbe(
+void SelectionBox::setMsMausRahmenFarbe(
     int i, int f) // set multistyle mouse border color
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
@@ -648,7 +648,7 @@ void AuswahlBox::setMsMausRahmenFarbe(
     rend = 1;
 }
 
-void AuswahlBox::setMsMausRahmenBreite(
+void SelectionBox::setMsMausRahmenBreite(
     int i, int rbr) // set multistyle mouse border width
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
@@ -658,7 +658,7 @@ void AuswahlBox::setMsMausRahmenBreite(
     rend = 1;
 }
 
-void AuswahlBox::setMsMausHintergrundFarbe(
+void SelectionBox::setMsMausHintergrundFarbe(
     int i, int f) // set multistyle mouse background color
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
@@ -667,7 +667,7 @@ void AuswahlBox::setMsMausHintergrundFarbe(
     rend = 1;
 }
 
-void AuswahlBox::setMsMausHintergrundImageZ(
+void SelectionBox::setMsMausHintergrundImageZ(
     int i, Image* bgB) // set multistyle mouse background image
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
@@ -680,7 +680,7 @@ void AuswahlBox::setMsMausHintergrundImageZ(
     rend = 1;
 }
 
-void AuswahlBox::setMsMausHintergrundImage(int i, Image* bgB)
+void SelectionBox::setMsMausHintergrundImage(int i, Image* bgB)
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
@@ -705,40 +705,40 @@ void AuswahlBox::setMsMausHintergrundImage(int i, Image* bgB)
     rend = 1;
 }
 
-void AuswahlBox::setMsMausAlphaFeldZ(
-    int i, AlphaFeld* af) // set multistyle mouse AlphaFeld
+void SelectionBox::setMsMouseAlphaFieldZ(
+    int i, AlphaField* af) // set multistyle mouse AlphaField
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
         af->release();
         return;
     }
-    if (!msMausAf) msMausAf = new RCArray<AlphaFeld>();
+    if (!msMausAf) msMausAf = new RCArray<AlphaField>();
     msMausAf->set(af, i);
     rend = 1;
 }
 
-void AuswahlBox::setMsMausAlphaFeldFarbe(
-    int i, int afF) // set multistyle mouse AlphaFeld color
+void SelectionBox::setMsMausAlphaFeldFarbe(
+    int i, int afF) // set multistyle mouse AlphaField color
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msMausAf) msMausAf = new RCArray<AlphaFeld>();
-    if (!msMausAf->z(i)) msMausAf->set(new AlphaFeld(), i);
+    if (!msMausAf) msMausAf = new RCArray<AlphaField>();
+    if (!msMausAf->z(i)) msMausAf->set(new AlphaField(), i);
     msMausAf->z(i)->setFarbe(afF);
     rend = 1;
 }
 
-void AuswahlBox::setMsMausAlphaFeldStrength(
-    int i, int afSt) // set multistyle mouse AlphaFeld strength
+void SelectionBox::setMsMausAlphaFeldStrength(
+    int i, int afSt) // set multistyle mouse AlphaField strength
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msMausAf) msMausAf = new RCArray<AlphaFeld>();
-    if (!msMausAf->z(i)) msMausAf->set(new AlphaFeld(), i);
+    if (!msMausAf) msMausAf = new RCArray<AlphaField>();
+    if (!msMausAf->z(i)) msMausAf->set(new AlphaField(), i);
     msMausAf->z(i)->setStrength(afSt);
     rend = 1;
 }
 
-void AuswahlBox::setAuswahl(int i) // select entry
+void SelectionBox::setAuswahl(int i) // select entry
 {
     if (i < anzahl && i != auswahl)
     {
@@ -748,17 +748,17 @@ void AuswahlBox::setAuswahl(int i) // select entry
     }
 }
 
-void AuswahlBox::ausklappen() // expand list
+void SelectionBox::ausklappen() // expand list
 {
     ausgeklappt = 1;
 }
 
-void AuswahlBox::einklappen() // collapse list
+void SelectionBox::einklappen() // collapse list
 {
     ausgeklappt = 0;
 }
 
-void AuswahlBox::scrollZuEintrag(int i) // scroll list
+void SelectionBox::scrollZuEintrag(int i) // scroll list
 {
     if (hatStyle(Style::VScroll) && vertikalScrollBar && i < anzahl)
     {
@@ -775,18 +775,18 @@ void AuswahlBox::scrollZuEintrag(int i) // scroll list
     }
 }
 
-void AuswahlBox::setMaxAuskappHeight(
+void SelectionBox::setMaxAuskappHeight(
     int maxHeight) // height of the list when expanded
 {
     ausklapMaxHeight = maxHeight;
 }
 
-void AuswahlBox::setEintragHeight(int height) // sets the height of the entries
+void SelectionBox::setEintragHeight(int height) // sets the height of the entries
 {
     eintragHeight = height;
 }
 
-void AuswahlBox::addMsStyle(int i, __int64 abStyle) // add multistyle style
+void SelectionBox::addMsStyle(int i, __int64 abStyle) // add multistyle style
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
     if (!msStyle) msStyle = new Array<__int64>();
@@ -794,7 +794,7 @@ void AuswahlBox::addMsStyle(int i, __int64 abStyle) // add multistyle style
     rend = 1;
 }
 
-void AuswahlBox::setMsStyle(
+void SelectionBox::setMsStyle(
     int i, __int64 abStyle, bool add) // set multistyle style
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
@@ -806,7 +806,7 @@ void AuswahlBox::setMsStyle(
     rend = 1;
 }
 
-void AuswahlBox::setMsStyle(int i, __int64 abStyle)
+void SelectionBox::setMsStyle(int i, __int64 abStyle)
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
     if (!msStyle) msStyle = new Array<__int64>();
@@ -814,7 +814,7 @@ void AuswahlBox::setMsStyle(int i, __int64 abStyle)
     rend = 1;
 }
 
-void AuswahlBox::removeMsStyle(
+void SelectionBox::removeMsStyle(
     int i, __int64 abStyle) // remove multistyle style
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
@@ -823,7 +823,7 @@ void AuswahlBox::removeMsStyle(
     rend = 1;
 }
 
-bool AuswahlBox::tick(double tickVal) // tick
+bool SelectionBox::tick(double tickVal) // tick
 {
     if (ausgeklappt && ausfahren && !ausfahren->zText()->istGleich("/\\"))
     {
@@ -887,7 +887,7 @@ bool AuswahlBox::tick(double tickVal) // tick
     return DrawableBackground::tick(tickVal);
 }
 
-void AuswahlBox::doTastaturEreignis(TastaturEreignis& te) // Keyboard
+void SelectionBox::doKeyboardEvent(KeyboardEvent& te) // Keyboard
 {
     if (te.verarbeitet || hatStyleNicht(Style::Fokus)
         || hatStyleNicht(Style::Erlaubt))
@@ -919,7 +919,7 @@ void AuswahlBox::doTastaturEreignis(TastaturEreignis& te) // Keyboard
     if (te.verarbeitet && nTak) te.verarbeitet = nTak(ntakParam, this, te);
 }
 
-void AuswahlBox::render(Image& zRObj) // renders into zRObj
+void SelectionBox::render(Image& zRObj) // renders into zRObj
 {
     if (hatStyle(Style::Sichtbar))
     {
@@ -990,7 +990,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
             TextField* tf = auswahl >= 0 ? members->z(auswahl) : 0;
             if (tf)
             {
-                AlphaFeld* tmpBuffer = 0;
+                AlphaField* tmpBuffer = 0;
                 bool tmpB = 0;
                 int tmpHFarbe = 0;
                 bool tmpH = 0;
@@ -1003,9 +1003,9 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                 {
                     if (hatStyle(Style::AuswahlBuffer))
                     {
-                        tmpBuffer = tf->getAlphaFeld();
-                        tf->setAlphaFeldZ(
-                            dynamic_cast<AlphaFeld*>(auswAf->getThis()));
+                        tmpBuffer = tf->getAlphaField();
+                        tf->setAlphaFieldZ(
+                            dynamic_cast<AlphaField*>(auswAf->getThis()));
                         tmpB = tf->hatStyle(TextField::Style::Buffered);
                         tf->setStyle(TextField::Style::Buffered,
                             hatStyle(Style::AuswahlBuffer));
@@ -1047,8 +1047,8 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                 {
                     if (hatMsStyle(auswahl, Style::AuswahlBuffer) && msAuswAf)
                     {
-                        tmpBuffer = tf->getAlphaFeld();
-                        tf->setAlphaFeldZ(msAuswAf->get(auswahl));
+                        tmpBuffer = tf->getAlphaField();
+                        tf->setAlphaFieldZ(msAuswAf->get(auswahl));
                         tmpB = tf->hatStyle(TextField::Style::Buffered);
                         tf->setStyle(TextField::Style::Buffered,
                             hatMsStyle(auswahl, Style::AuswahlBuffer));
@@ -1100,7 +1100,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                 {
                     if (hatStyle(Style::AuswahlBuffer))
                     {
-                        tf->setAlphaFeldZ(tmpBuffer);
+                        tf->setAlphaFieldZ(tmpBuffer);
                         tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
                     if (hatStyle(Style::AuswahlHintergrund))
@@ -1125,7 +1125,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                 {
                     if (hatMsStyle(auswahl, Style::AuswahlBuffer) && msAuswAf)
                     {
-                        tf->setAlphaFeldZ(tmpBuffer);
+                        tf->setAlphaFieldZ(tmpBuffer);
                         tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
                     if (hatMsStyle(auswahl, Style::AuswahlHintergrund))
@@ -1184,7 +1184,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
             int dy = 0;
             if (vsb) dy -= vertikalScrollBar->getScroll();
             int mdy = hi - rbr;
-            anzahl = members->getEintragAnzahl();
+            anzahl = members->getEntryCount();
             for (int i = 0; i < anzahl; ++i)
             {
                 TextField* tf = members->z(i);
@@ -1193,7 +1193,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                 tf->setSize(br - rbr * 2, tf->getHeight());
                 maxHeight += tf->getHeight();
                 bool selected = auswahl == i;
-                AlphaFeld* tmpBuffer = 0;
+                AlphaField* tmpBuffer = 0;
                 bool tmpB = 0;
                 int tmpHFarbe = 0;
                 bool tmpH = 0;
@@ -1208,9 +1208,9 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                     {
                         if (hatStyle(Style::AuswahlBuffer))
                         {
-                            tmpBuffer = tf->getAlphaFeld();
-                            tf->setAlphaFeldZ(
-                                dynamic_cast<AlphaFeld*>(auswAf->getThis()));
+                            tmpBuffer = tf->getAlphaField();
+                            tf->setAlphaFieldZ(
+                                dynamic_cast<AlphaField*>(auswAf->getThis()));
                             tmpB = tf->hatStyle(TextField::Style::Buffered);
                             tf->setStyle(TextField::Style::Buffered,
                                 hatStyle(Style::AuswahlBuffer));
@@ -1253,8 +1253,8 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                     {
                         if (hatMsStyle(i, Style::AuswahlBuffer) && msAuswAf)
                         {
-                            tmpBuffer = tf->getAlphaFeld();
-                            tf->setAlphaFeldZ(msAuswAf->get(i));
+                            tmpBuffer = tf->getAlphaField();
+                            tf->setAlphaFieldZ(msAuswAf->get(i));
                             tmpB = tf->hatStyle(TextField::Style::Buffered);
                             tf->setStyle(TextField::Style::Buffered,
                                 hatMsStyle(i, Style::AuswahlBuffer));
@@ -1301,9 +1301,9 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                     {
                         if (hatStyle(Style::MausBuffer))
                         {
-                            tmpBuffer = tf->getAlphaFeld();
-                            tf->setAlphaFeldZ(
-                                dynamic_cast<AlphaFeld*>(mausAf->getThis()));
+                            tmpBuffer = tf->getAlphaField();
+                            tf->setAlphaFieldZ(
+                                dynamic_cast<AlphaField*>(mausAf->getThis()));
                             tmpB = tf->hatStyle(TextField::Style::Buffered);
                             tf->setStyle(TextField::Style::Buffered,
                                 hatStyle(Style::MausBuffer));
@@ -1346,8 +1346,8 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                     {
                         if (hatMsStyle(i, Style::MausBuffer) && msAuswAf)
                         {
-                            tmpBuffer = tf->getAlphaFeld();
-                            tf->setAlphaFeldZ(msMausAf->get(i));
+                            tmpBuffer = tf->getAlphaField();
+                            tf->setAlphaFieldZ(msMausAf->get(i));
                             tmpB = tf->hatStyle(TextField::Style::Buffered);
                             tf->setStyle(TextField::Style::Buffered,
                                 hatMsStyle(i, Style::MausBuffer));
@@ -1395,7 +1395,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                     {
                         if (hatStyle(Style::AuswahlBuffer))
                         {
-                            tf->setAlphaFeldZ(tmpBuffer);
+                            tf->setAlphaFieldZ(tmpBuffer);
                             tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
                         if (hatStyle(Style::AuswahlHintergrund))
@@ -1421,7 +1421,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                     {
                         if (hatMsStyle(i, Style::AuswahlBuffer) && msAuswAf)
                         {
-                            tf->setAlphaFeldZ(tmpBuffer);
+                            tf->setAlphaFieldZ(tmpBuffer);
                             tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
                         if (hatMsStyle(i, Style::AuswahlHintergrund))
@@ -1451,7 +1451,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                     {
                         if (hatStyle(Style::MausBuffer))
                         {
-                            tf->setAlphaFeldZ(tmpBuffer);
+                            tf->setAlphaFieldZ(tmpBuffer);
                             tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
                         if (hatStyle(Style::MausHintergrund))
@@ -1477,7 +1477,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
                     {
                         if (hatMsStyle(i, Style::MausBuffer) && msAuswAf)
                         {
-                            tf->setAlphaFeldZ(tmpBuffer);
+                            tf->setAlphaFieldZ(tmpBuffer);
                             tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
                         if (hatMsStyle(i, Style::MausHintergrund))
@@ -1514,7 +1514,7 @@ void AuswahlBox::render(Image& zRObj) // renders into zRObj
 }
 
 // constant
-int AuswahlBox::getEintragPos(
+int SelectionBox::getEintragPos(
     const char* txt) const // returns the entry position
 {
     for (int i = 0; i < anzahl; ++i)
@@ -1522,7 +1522,7 @@ int AuswahlBox::getEintragPos(
     return -1;
 }
 
-int AuswahlBox::getEintragPos(Text* txt) const
+int SelectionBox::getEintragPos(Text* txt) const
 {
     for (int i = 0; i < anzahl; ++i)
     {
@@ -1536,84 +1536,84 @@ int AuswahlBox::getEintragPos(Text* txt) const
     return -1;
 }
 
-Text* AuswahlBox::getEintragText(int i) const // returns the entry text
+Text* SelectionBox::getEintragText(int i) const // returns the entry text
 {
     if (i >= anzahl) return 0;
     return members->z(i) ? members->z(i)->getText() : 0;
 }
 
-Text* AuswahlBox::zEintragText(int i) const
+Text* SelectionBox::zEintragText(int i) const
 {
     if (i >= anzahl) return 0;
     return members->z(i) ? members->z(i)->zText() : 0;
 }
 
-TextField* AuswahlBox::getEintrag(int i) const // returns the entry
+TextField* SelectionBox::getEintrag(int i) const // returns the entry
 {
     if (i >= anzahl) return 0;
     return members->get(i);
 }
 
-TextField* AuswahlBox::zEintrag(int i) const
+TextField* SelectionBox::zEintrag(int i) const
 {
     if (i >= anzahl) return 0;
     return members->z(i);
 }
 
-int AuswahlBox::getAuswahl() const // returns the position of the selected entry
+int SelectionBox::getAuswahl() const // returns the position of the selected entry
 {
     return auswahl;
 }
 
-int AuswahlBox::getEintragAnzahl() const // returns the number of entries
+int SelectionBox::getEntryCount() const // returns the number of entries
 {
     return anzahl;
 }
 
-bool AuswahlBox::istAusgeklappt() const // checks if the list is expanded
+bool SelectionBox::istAusgeklappt() const // checks if the list is expanded
 {
     return ausgeklappt;
 }
 
-int AuswahlBox::getMaxHeight() const // returns the maximum list height
+int SelectionBox::getMaxHeight() const // returns the maximum list height
 {
     if (!hatStyle(Style::MaxHeight)) return 0;
     return ausklapMaxHeight;
 }
 
-int AuswahlBox::getEintragHeight() const // returns the height of the entries
+int SelectionBox::getEintragHeight() const // returns the height of the entries
 {
     return eintragHeight;
 }
 
-Knopf*
-AuswahlBox::getAusklappKnopf() const // returns the expand/collapse button
+Button*
+SelectionBox::getDropDownButton() const // returns the expand/collapse button
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return ausfahren ? dynamic_cast<Knopf*>(ausfahren->getThis()) : 0;
+    return ausfahren ? dynamic_cast<Button*>(ausfahren->getThis()) : 0;
 }
 
-Knopf* AuswahlBox::zAusklappKnopf() const
+Button* SelectionBox::zDropDownButton() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return ausfahren;
 }
 
-Border* AuswahlBox::getEntryBorder(int i) const // returns the entry border
+Border* SelectionBox::getEntryBorder(int i) const // returns the entry border
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->getBorder();
 }
 
-Border* AuswahlBox::zEntryBorder(int i) const
+Border* SelectionBox::zEntryBorder(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->zBorder();
 }
 
-int AuswahlBox::getEintragRahmenFarbe(
+int SelectionBox::getEintragRahmenFarbe(
     int i) const // returns the entry border color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1621,7 +1621,7 @@ int AuswahlBox::getEintragRahmenFarbe(
     return members->z(i)->getBorderColor();
 }
 
-int AuswahlBox::getEintragRahmenBreite(
+int SelectionBox::getEintragRahmenBreite(
     int i) const // returns the entry border width
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1629,38 +1629,38 @@ int AuswahlBox::getEintragRahmenBreite(
     return members->z(i)->getBorderWidth();
 }
 
-AlphaFeld* AuswahlBox::getEintragAlphaFeld(
-    int i) const // returns the entry AlphaFeld
+AlphaField* SelectionBox::getEntryAlphaField(
+    int i) const // returns the entry AlphaField
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getAlphaFeld();
+    return members->z(i)->getAlphaField();
 }
 
-AlphaFeld* AuswahlBox::zEintragAlphaFeld(int i) const
+AlphaField* SelectionBox::zEntryAlphaField(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->zAlphaFeld();
+    return members->z(i)->zAlphaField();
 }
 
-int AuswahlBox::getEintragAlphaFeldFarbe(
-    int i) const // returns the entry AlphaFeld color
+int SelectionBox::getEintragAlphaFeldFarbe(
+    int i) const // returns the entry AlphaField color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getAlphaFeldFarbe();
+    return members->z(i)->getAlphaFieldColor();
 }
 
-int AuswahlBox::getEintragAlphaFeldStrength(
-    int i) const // returns the entry AlphaFeld strength
+int SelectionBox::getEintragAlphaFeldStrength(
+    int i) const // returns the entry AlphaField strength
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getAlphaFeldStrength();
+    return members->z(i)->getAlphaFieldStrength();
 }
 
-int AuswahlBox::getEintragHintergrundFarbe(
+int SelectionBox::getEintragHintergrundFarbe(
     int i) const // returns the entry background color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1668,7 +1668,7 @@ int AuswahlBox::getEintragHintergrundFarbe(
     return members->z(i)->getHintergrundFarbe();
 }
 
-Image* AuswahlBox::getEintragHintergrundImage(
+Image* SelectionBox::getEintragHintergrundImage(
     int i) const // returns the entry background image
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1676,86 +1676,86 @@ Image* AuswahlBox::getEintragHintergrundImage(
     return members->z(i)->getHintergrundImage();
 }
 
-Image* AuswahlBox::zEintragHintergrundImage(int i) const
+Image* SelectionBox::zEintragHintergrundImage(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->zHintergrundImage();
 }
 
-Border* AuswahlBox::getSelBorder() const // returns the selection border
+Border* SelectionBox::getSelBorder() const // returns the selection border
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return selBorder ? dynamic_cast<Border*>(selBorder->getThis()) : 0;
 }
 
-Border* AuswahlBox::zSelBorder() const
+Border* SelectionBox::zSelBorder() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return selBorder;
 }
 
-int AuswahlBox::getAuswRahmenFarbe() const // returns the selection border color
+int SelectionBox::getAuswRahmenFarbe() const // returns the selection border color
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return selBorder ? selBorder->getFarbe() : 0;
 }
 
-int AuswahlBox::getAuswRahmenBreite()
+int SelectionBox::getAuswRahmenBreite()
     const // returns the selection border width
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return selBorder ? selBorder->getRBreite() : 0;
 }
 
-AlphaFeld*
-AuswahlBox::getAuswAlphaFeld() const // returns the selection AlphaFeld
+AlphaField*
+SelectionBox::getSelAlphaField() const // returns the selection AlphaField
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return auswAf ? dynamic_cast<AlphaFeld*>(auswAf->getThis()) : 0;
+    return auswAf ? dynamic_cast<AlphaField*>(auswAf->getThis()) : 0;
 }
 
-AlphaFeld* AuswahlBox::zAuswAlphaFeld() const
+AlphaField* SelectionBox::zSelAlphaField() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return auswAf;
 }
 
-int AuswahlBox::getAuswAlphaFeldFarbe()
-    const // returns the selection AlphaFeld color
+int SelectionBox::getAuswAlphaFeldFarbe()
+    const // returns the selection AlphaField color
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return auswAf ? auswAf->getFarbe() : 0;
 }
 
-int AuswahlBox::getAuswAlphaFeldStrength()
-    const // returns the selection AlphaFeld strength
+int SelectionBox::getAuswAlphaFeldStrength()
+    const // returns the selection AlphaField strength
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return auswAf ? auswAf->getStrength() : 0;
 }
 
-int AuswahlBox::getAuswHintergrundFarbe()
+int SelectionBox::getAuswHintergrundFarbe()
     const // returns the selection background color
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return auswBgF;
 }
 
-Image* AuswahlBox::getAuswHintergrundImage()
+Image* SelectionBox::getAuswHintergrundImage()
     const // returns the selection background image
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return auswBgB ? dynamic_cast<Image*>(auswBgB->getThis()) : 0;
 }
 
-Image* AuswahlBox::zAuswHintergrundImage() const
+Image* SelectionBox::zAuswHintergrundImage() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return auswBgB;
 }
 
-Border* AuswahlBox::getMsSelBorder(
+Border* SelectionBox::getMsSelBorder(
     int i) const // returns the multistyle selection border
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1765,14 +1765,14 @@ Border* AuswahlBox::getMsSelBorder(
              : 0;
 }
 
-Border* AuswahlBox::zMsSelBorder(int i) const
+Border* SelectionBox::zMsSelBorder(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msSelBorder) return 0;
     return msSelBorder->z(i);
 }
 
-int AuswahlBox::getMsAuswRahmenFarbe(
+int SelectionBox::getMsAuswRahmenFarbe(
     int i) const // returns the multistyle selection border color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1780,7 +1780,7 @@ int AuswahlBox::getMsAuswRahmenFarbe(
     return msSelBorder->z(i) ? msSelBorder->z(i)->getFarbe() : 0;
 }
 
-int AuswahlBox::getMsAuswRahmenBreite(
+int SelectionBox::getMsAuswRahmenBreite(
     int i) const // returns the multistyle selection border width
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1788,39 +1788,39 @@ int AuswahlBox::getMsAuswRahmenBreite(
     return msSelBorder->z(i) ? msSelBorder->z(i)->getRBreite() : 0;
 }
 
-AlphaFeld* AuswahlBox::getMsAuswAlphaFeld(
-    int i) const // returns the multistyle selection AlphaFeld
+AlphaField* SelectionBox::getMsSelAlphaField(
+    int i) const // returns the multistyle selection AlphaField
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msAuswAf) return 0;
-    return msAuswAf->z(i) ? dynamic_cast<AlphaFeld*>(msAuswAf->z(i)->getThis())
+    return msAuswAf->z(i) ? dynamic_cast<AlphaField*>(msAuswAf->z(i)->getThis())
                           : 0;
 }
 
-AlphaFeld* AuswahlBox::zMsAuswAlphaFeld(int i) const
+AlphaField* SelectionBox::zMsSelAlphaField(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msAuswAf) return 0;
     return msAuswAf->z(i);
 }
 
-int AuswahlBox::getMsAuswAlphaFeldFarbe(
-    int i) const // returns the multistyle selection AlphaFeld color
+int SelectionBox::getMsAuswAlphaFeldFarbe(
+    int i) const // returns the multistyle selection AlphaField color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msAuswAf) return 0;
     return msAuswAf->z(i) ? msAuswAf->z(i)->getFarbe() : 0;
 }
 
-int AuswahlBox::getMsAuswAlphaFeldStrength(
-    int i) const // returns the multistyle selection AlphaFeld strength
+int SelectionBox::getMsAuswAlphaFeldStrength(
+    int i) const // returns the multistyle selection AlphaField strength
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msAuswAf) return 0;
     return msAuswAf->z(i) ? msAuswAf->z(i)->getStrength() : 0;
 }
 
-int AuswahlBox::getMsAuswHintergrundFarbe(
+int SelectionBox::getMsAuswHintergrundFarbe(
     int i) const // returns the multistyle selection background color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1828,7 +1828,7 @@ int AuswahlBox::getMsAuswHintergrundFarbe(
     return msAuswBgF->get(i);
 }
 
-Image* AuswahlBox::getMsAuswHintergrundImage(
+Image* SelectionBox::getMsAuswHintergrundImage(
     int i) const // returns the multistyle selection background image
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1836,84 +1836,84 @@ Image* AuswahlBox::getMsAuswHintergrundImage(
     return msAuswBgB->get(i);
 }
 
-Image* AuswahlBox::zMsAuswHintergrundImage(int i) const
+Image* SelectionBox::zMsAuswHintergrundImage(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msAuswBgB) return 0;
     return msAuswBgB->z(i);
 }
 
-Border* AuswahlBox::getMouseBorder() const // returns the mouse border
+Border* SelectionBox::getMouseBorder() const // returns the mouse border
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mouseBorder ? dynamic_cast<Border*>(mouseBorder->getThis()) : 0;
 }
 
-Border* AuswahlBox::zMouseBorder() const
+Border* SelectionBox::zMouseBorder() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mouseBorder;
 }
 
-int AuswahlBox::getMausRahmenFarbe() const // returns the mouse border color
+int SelectionBox::getMausRahmenFarbe() const // returns the mouse border color
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mouseBorder ? mouseBorder->getFarbe() : 0;
 }
 
-int AuswahlBox::getMausRahmenBreite() const // returns the mouse border width
+int SelectionBox::getMausRahmenBreite() const // returns the mouse border width
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mouseBorder ? mouseBorder->getRBreite() : 0;
 }
 
-AlphaFeld* AuswahlBox::getMausAlphaFeld() const // returns the mouse AlphaFeld
+AlphaField* SelectionBox::getMouseAlphaField() const // returns the mouse AlphaField
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return mausAf ? dynamic_cast<AlphaFeld*>(mausAf->getThis()) : 0;
+    return mausAf ? dynamic_cast<AlphaField*>(mausAf->getThis()) : 0;
 }
 
-AlphaFeld* AuswahlBox::zMausAlphaFeld() const
+AlphaField* SelectionBox::zMouseAlphaField() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mausAf;
 }
 
-int AuswahlBox::getMausAlphaFeldFarbe()
-    const // returns the mouse AlphaFeld color
+int SelectionBox::getMausAlphaFeldFarbe()
+    const // returns the mouse AlphaField color
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mausAf ? mausAf->getFarbe() : 0;
 }
 
-int AuswahlBox::getMausAlphaFeldStrength()
-    const // returns the mouse AlphaFeld strength
+int SelectionBox::getMausAlphaFeldStrength()
+    const // returns the mouse AlphaField strength
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mausAf ? mausAf->getStrength() : 0;
 }
 
-int AuswahlBox::getMausHintergrundFarbe()
+int SelectionBox::getMausHintergrundFarbe()
     const // returns the mouse background color
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mausBgF;
 }
 
-Image* AuswahlBox::getMausHintergrundImage()
+Image* SelectionBox::getMausHintergrundImage()
     const // returns the mouse background image
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mausBgB ? dynamic_cast<Image*>(mausBgB->getThis()) : 0;
 }
 
-Image* AuswahlBox::zMausHintergrundImage() const
+Image* SelectionBox::zMausHintergrundImage() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mausBgB;
 }
 
-Border* AuswahlBox::getMsMouseBorder(
+Border* SelectionBox::getMsMouseBorder(
     int i) const // returns the multistyle mouse border
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1921,14 +1921,14 @@ Border* AuswahlBox::getMsMouseBorder(
     return msMouseBorder->get(i);
 }
 
-Border* AuswahlBox::zMsMouseBorder(int i) const
+Border* SelectionBox::zMsMouseBorder(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msMouseBorder) return 0;
     return msMouseBorder->z(i);
 }
 
-int AuswahlBox::getMsMausRahmenFarbe(
+int SelectionBox::getMsMausRahmenFarbe(
     int i) const // returns the multistyle mouse border color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1936,7 +1936,7 @@ int AuswahlBox::getMsMausRahmenFarbe(
     return msMouseBorder->z(i) ? msMouseBorder->z(i)->getFarbe() : 0;
 }
 
-int AuswahlBox::getMsMausRahmenBreite(
+int SelectionBox::getMsMausRahmenBreite(
     int i) const // returns the multistyle mouse border width
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1944,38 +1944,38 @@ int AuswahlBox::getMsMausRahmenBreite(
     return msMouseBorder->z(i) ? msMouseBorder->z(i)->getRBreite() : 0;
 }
 
-AlphaFeld* AuswahlBox::getMsMausAlphaFeld(
-    int i) const // returns the multistyle mouse AlphaFeld
+AlphaField* SelectionBox::getMsMouseAlphaField(
+    int i) const // returns the multistyle mouse AlphaField
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msMausAf) return 0;
     return msMausAf->get(i);
 }
 
-AlphaFeld* AuswahlBox::zMsMausAlphaFeld(int i) const
+AlphaField* SelectionBox::zMsMouseAlphaField(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msMausAf) return 0;
     return msMausAf->z(i);
 }
 
-int AuswahlBox::getMsMausAlphaFeldFarbe(
-    int i) const // returns the multistyle mouse AlphaFeld color
+int SelectionBox::getMsMausAlphaFeldFarbe(
+    int i) const // returns the multistyle mouse AlphaField color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msMausAf) return 0;
     return msMausAf->z(i) ? msMausAf->z(i)->getFarbe() : 0;
 }
 
-int AuswahlBox::getMsMausAlphaFeldStrength(
-    int i) const // returns the multistyle mouse AlphaFeld strength
+int SelectionBox::getMsMausAlphaFeldStrength(
+    int i) const // returns the multistyle mouse AlphaField strength
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msMausAf) return 0;
     return msMausAf->z(i) ? msMausAf->z(i)->getStrength() : 0;
 }
 
-int AuswahlBox::getMsMausHintergrundFarbe(
+int SelectionBox::getMsMausHintergrundFarbe(
     int i) const // returns the multistyle mouse background color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1983,7 +1983,7 @@ int AuswahlBox::getMsMausHintergrundFarbe(
     return msMausBgF->get(i);
 }
 
-Image* AuswahlBox::getMsMausHintergrundImage(
+Image* SelectionBox::getMsMausHintergrundImage(
     int i) const // returns the multistyle mouse background image
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1991,7 +1991,7 @@ Image* AuswahlBox::getMsMausHintergrundImage(
     return msMausBgB->get(i);
 }
 
-Image* AuswahlBox::zMsMausHintergrundImage(int i) const
+Image* SelectionBox::zMsMausHintergrundImage(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msMausBgB) return 0;
@@ -2002,13 +2002,13 @@ Image* AuswahlBox::zMsMausHintergrundImage(int i) const
 //  x: the x coordinate of the point
 //  y: the y coordinate of the point
 //  return: 1 if the point is inside, 0 otherwise
-bool AuswahlBox::istPunktInnen(int x, int y) const
+bool SelectionBox::istPunktInnen(int x, int y) const
 {
     return x >= pos.x && x < pos.x + gr.x && y >= pos.y
         && y < pos.y + gr.y + ausklappHeight;
 }
 
-bool AuswahlBox::hatMsStyle(
+bool SelectionBox::hatMsStyle(
     int i, __int64 abStyle) const // checks if multistyle style is present
 {
     if ((style | Style::MultiStyled) != style || !msStyle || !msStyle->hat(i))
@@ -2016,7 +2016,7 @@ bool AuswahlBox::hatMsStyle(
     return (msStyle->get(i) | abStyle) == msStyle->get(i);
 }
 
-bool AuswahlBox::hatMsStyleNicht(
+bool SelectionBox::hatMsStyleNicht(
     int i, __int64 abStyle) const // checks if multistyle style is not present
 {
     if ((style | Style::MultiStyled) != style || !msStyle || !msStyle->hat(i))
@@ -2024,37 +2024,37 @@ bool AuswahlBox::hatMsStyleNicht(
     return (msStyle->get(i) | abStyle) != msStyle->get(i);
 }
 
-Drawable* AuswahlBox::dublizieren() const // Creates a copy of the drawing
+Drawable* SelectionBox::dublizieren() const // Creates a copy of the drawing
 {
-    AuswahlBox* obj = new AuswahlBox();
+    SelectionBox* obj = new SelectionBox();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStyle(style);
     if (textRd)
         obj->setTextRendererZ(dynamic_cast<TextRenderer*>(textRd->getThis()));
     if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
-    if (ausfahren) obj->setAusklappKnopfZ((Knopf*)ausfahren->dublizieren());
+    if (ausfahren) obj->setDropDownButtonZ((Button*)ausfahren->dublizieren());
     obj->setHintergrundFarbe(hintergrundFarbe);
     if (hintergrundImage)
         obj->setHintergrundImage(
             dynamic_cast<Image*>(hintergrundImage->getThis()));
     if (hintergrundFeld)
-        obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
+        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
     if (selBorder) obj->setSelBorderZ((Border*)selBorder->dublizieren());
     obj->setAuswHintergrundFarbe(auswBgF);
     if (auswBgB)
         obj->setAuswHintergrundImage(dynamic_cast<Image*>(auswBgB->getThis()));
-    if (auswAf) obj->setAuswAlphaFeldZ((AlphaFeld*)auswAf->dublizieren());
+    if (auswAf) obj->setSelAlphaFieldZ((AlphaField*)auswAf->dublizieren());
     if (mouseBorder) obj->setMouseBorderZ((Border*)mouseBorder->dublizieren());
     obj->setMausHintergrundFarbe(mausBgF);
     if (mausBgB)
         obj->setMausHintergrundImage(dynamic_cast<Image*>(mausBgB->getThis()));
-    if (mausAf) obj->setMausAlphaFeldZ((AlphaFeld*)mausAf->dublizieren());
+    if (mausAf) obj->setMouseAlphaFieldZ((AlphaField*)mausAf->dublizieren());
     obj->setMaxAuskappHeight(ausklapMaxHeight);
     obj->setEintragHeight(eintragHeight);
     for (int i = 0; i < anzahl; ++i)
@@ -2072,8 +2072,8 @@ Drawable* AuswahlBox::dublizieren() const // Creates a copy of the drawing
             if (msAuswBgB && msAuswBgB->z(i))
                 obj->setMsAuswHintergrundImage(i, msAuswBgB->get(i));
             if (msAuswAf && msAuswAf->z(i))
-                obj->setMsAuswAlphaFeldZ(
-                    i, (AlphaFeld*)msAuswAf->z(i)->dublizieren());
+                obj->setMsSelAlphaFieldZ(
+                    i, (AlphaField*)msAuswAf->z(i)->dublizieren());
             if (msMouseBorder && msMouseBorder->z(i))
                 obj->setMsMouseBorderZ(
                     i, (Border*)msMouseBorder->z(i)->dublizieren());
@@ -2082,10 +2082,10 @@ Drawable* AuswahlBox::dublizieren() const // Creates a copy of the drawing
             if (msMausBgB && msMausBgB->z(i))
                 obj->setMsMausHintergrundImage(i, msMausBgB->get(i));
             if (msMausAf && msMausAf->z(i))
-                obj->setMsMausAlphaFeldZ(
-                    i, (AlphaFeld*)msMausAf->z(i)->dublizieren());
+                obj->setMsMouseAlphaFieldZ(
+                    i, (AlphaField*)msMausAf->z(i)->dublizieren());
         }
     }
-    obj->setAlphaFeldFarbe(auswahl);
+    obj->setAlphaFieldColor(auswahl);
     return obj;
 }

SelectionBox.h

@@ -1,5 +1,5 @@
-#ifndef AuswahlBox_H
-#define AuswahlBox_H
+#ifndef SelectionBox_H
+#define SelectionBox_H
 
 #include "Array.h"
 #include "Drawing.h"
@@ -9,15 +9,15 @@ namespace Framework
     class TextField;   //! TextField.h
     class VScrollBar; //! Scroll.h
     class Border;     //! Border.h
-    class Knopf;      //! Button.h
-    class AlphaFeld;  //! AlphaField.h
+    class Button;      //! Button.h
+    class AlphaField;  //! AlphaField.h
     class Text;       //! Tet.h
     class Font;    //! Font.h
     class TextRenderer;
 
     //! A 2D GUI Framework drawing. Represents a box from which
     //! the user can select different values by expanding it
-    class AuswahlBox : public DrawableBackground
+    class SelectionBox : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -89,23 +89,23 @@ namespace Framework
         TextRenderer* textRd;
         Array<__int64>* msStyle;
         RCArray<TextField>* members;
-        Knopf* ausfahren;
+        Button* ausfahren;
         Border* selBorder;
         int auswBgF;
         Image* auswBgB;
-        AlphaFeld* auswAf;
+        AlphaField* auswAf;
         RCArray<Border>* msSelBorder;
         Array<int>* msAuswBgF;
         RCArray<Image>* msAuswBgB;
-        RCArray<AlphaFeld>* msAuswAf;
+        RCArray<AlphaField>* msAuswAf;
         Border* mouseBorder;
         int mausBgF;
         Image* mausBgB;
-        AlphaFeld* mausAf;
+        AlphaField* mausAf;
         RCArray<Border>* msMouseBorder;
         Array<int>* msMausBgF;
         RCArray<Image>* msMausBgB;
-        RCArray<AlphaFeld>* msMausAf;
+        RCArray<AlphaField>* msMausAf;
         int anzahl;
         int auswahl;
         bool ausgeklappt;
@@ -116,16 +116,16 @@ namespace Framework
         int mausEintrag;
         bool scrollAnzeigen;
         void* eAkP;
-        std::function<void(void*, AuswahlBox*, int, int)> eAk;
+        std::function<void(void*, SelectionBox*, int, int)> eAk;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
-        DLLEXPORT AuswahlBox();
+        DLLEXPORT SelectionBox();
         //! Destructor
-        DLLEXPORT virtual ~AuswahlBox();
+        DLLEXPORT virtual ~SelectionBox();
         //! Sets the parameter of the callback function that is called when
         //! the user selects a new element \param p The parameter
         DLLEXPORT void setEventParam(void* p);
@@ -133,7 +133,7 @@ namespace Framework
         //! selects a new element \param eAk The callback function call:
         //! eAk( parameter, this, 0, selectionIndex )
         DLLEXPORT void setEventAktion(
-            std::function<void(void*, AuswahlBox*, int, int)> event);
+            std::function<void(void*, SelectionBox*, int, int)> event);
         //! Sets the used TextRenderer
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
@@ -169,7 +169,7 @@ namespace Framework
         DLLEXPORT void removeEintrag(int i);
         //! Sets a pointer to the button used for expanding and collapsing
         //! the list \param ausK The button
-        DLLEXPORT void setAusklappKnopfZ(Knopf* ausK);
+        DLLEXPORT void setDropDownButtonZ(Button* ausK);
         //! Sets a pointer to a border used for a specific entry
         //! \param i The index of the entry \param rahmen The border
         DLLEXPORT void setEntryBorderZ(int i, Border* rahmen);
@@ -196,7 +196,7 @@ namespace Framework
         //! Sets a pointer to a color gradient used for a specific
         //! entry \param i The index of the entry \param af The
         //! color gradient
-        DLLEXPORT void setEintragAlphaFeldZ(int i, AlphaFeld* af);
+        DLLEXPORT void setEntryAlphaFieldZ(int i, AlphaField* af);
         //! Sets the color of a color gradient used for a specific
         //! entry \param i The index of the entry \param afF The
         //! color in A8R8G8B8 format
@@ -225,10 +225,10 @@ namespace Framework
         DLLEXPORT void setAuswHintergrundImage(Image* bgB);
         //! Sets a pointer to a color gradient used for the selected
         //! entry \param af The color gradient
-        DLLEXPORT void setAuswAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setSelAlphaFieldZ(AlphaField* af);
         //! Sets the color of a color gradient used for the selected
         //! entry \param afF The color in A8R8G8B8 format
-        DLLEXPORT void setAuswAlphaFeldFarbe(int afF);
+        DLLEXPORT void setSelAlphaFieldColor(int afF);
         //! Sets the strength of a color gradient used for the selected
         //! entry \param afSt The strength
         DLLEXPORT void setAuswAlphaFeldStrength(int afSt);
@@ -262,7 +262,7 @@ namespace Framework
         //! flag when selecting a specific entry
         //! \param i The index of the entry
         //! \param af The color gradient
-        DLLEXPORT void setMsAuswAlphaFeldZ(int i, AlphaFeld* af);
+        DLLEXPORT void setMsSelAlphaFieldZ(int i, AlphaField* af);
         //! Sets the color of a color gradient used with the MultiStyled flag
         //! when selecting a specific entry \param i The
         //! index of the entry \param afF The color in A8R8G8B8 format
@@ -291,10 +291,10 @@ namespace Framework
         DLLEXPORT void setMausHintergrundImage(Image* bgB);
         //! Sets a color gradient used for the entry the mouse is pointing
         //! at \param af The color gradient
-        DLLEXPORT void setMausAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setMouseAlphaFieldZ(AlphaField* af);
         //! Sets the color of a color gradient used for the entry the mouse
         //! is pointing at \param afF The color in A8R8G8B8 format
-        DLLEXPORT void setMausAlphaFeldFarbe(int afF);
+        DLLEXPORT void setMouseAlphaFieldColor(int afF);
         //! Sets the strength of a color gradient used for the entry the mouse
         //! is pointing at \param afSt The strength
         DLLEXPORT void setMausAlphaFeldStrength(int afSt);
@@ -327,7 +327,7 @@ namespace Framework
         //! Sets a pointer to a color gradient used with the MultiStyled
         //! flag for a specific entry the mouse is pointing at
         //! \param i The index of the entry \param af The color gradient
-        DLLEXPORT void setMsMausAlphaFeldZ(int i, AlphaFeld* af);
+        DLLEXPORT void setMsMouseAlphaFieldZ(int i, AlphaField* af);
         //! Sets the color of a color gradient used with the MultiStyled
         //! flag for a specific entry the mouse is pointing at
         //! \param i The index of the entry
@@ -378,7 +378,7 @@ namespace Framework
         DLLEXPORT bool tick(double tickVal) override;
         //! Processes keyboard messages
         //! \param te The event triggered by the keyboard input
-        DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
+        DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
@@ -403,7 +403,7 @@ namespace Framework
         //! Returns the index of the selected entry
         DLLEXPORT int getAuswahl() const;
         //! Returns the number of entries
-        DLLEXPORT int getEintragAnzahl() const;
+        DLLEXPORT int getEntryCount() const;
         //! Returns whether the list is currently expanded
         DLLEXPORT bool istAusgeklappt() const;
         //! Returns the maximum height of the expanded list
@@ -411,10 +411,10 @@ namespace Framework
         //! Returns the height of an entry
         DLLEXPORT int getEintragHeight() const;
         //! Returns the button used for expanding and collapsing the list
-        DLLEXPORT Knopf* getAusklappKnopf() const;
+        DLLEXPORT Button* getDropDownButton() const;
         //! Returns the button without increased reference counter used for
         //! expanding and collapsing the list
-        DLLEXPORT Knopf* zAusklappKnopf() const;
+        DLLEXPORT Button* zDropDownButton() const;
         //! Returns the border of an entry
         //! \param i The index of the entry
         DLLEXPORT Border* getEntryBorder(int i) const;
@@ -429,10 +429,10 @@ namespace Framework
         DLLEXPORT int getEintragRahmenBreite(int i) const;
         //! Returns the color gradient of an entry
         //! \param i The index of the entry
-        DLLEXPORT AlphaFeld* getEintragAlphaFeld(int i) const;
+        DLLEXPORT AlphaField* getEntryAlphaField(int i) const;
         //! Returns the color gradient of an entry without increased reference
         //! counter \param i The index of the entry
-        DLLEXPORT AlphaFeld* zEintragAlphaFeld(int i) const;
+        DLLEXPORT AlphaField* zEntryAlphaField(int i) const;
         //! Returns the color of a color gradient of an entry in A8R8G8B8 format
         //! \param i The index of the entry
         DLLEXPORT int getEintragAlphaFeldFarbe(int i) const;
@@ -459,10 +459,10 @@ namespace Framework
         //! Returns the width of the border used when selecting an entry
         DLLEXPORT int getAuswRahmenBreite() const;
         //! Returns the color gradient used when selecting an entry
-        DLLEXPORT AlphaFeld* getAuswAlphaFeld() const;
+        DLLEXPORT AlphaField* getSelAlphaField() const;
         //! Returns the color gradient without increased reference counter used
         //! when selecting an entry
-        DLLEXPORT AlphaFeld* zAuswAlphaFeld() const;
+        DLLEXPORT AlphaField* zSelAlphaField() const;
         //! Returns the color of the color gradient used when selecting
         //! an entry
         DLLEXPORT int getAuswAlphaFeldFarbe() const;
@@ -493,11 +493,11 @@ namespace Framework
         DLLEXPORT int getMsAuswRahmenBreite(int i) const;
         //! Returns the color gradient used with the MultiStyled flag when
         //! selecting a specific entry \param i The index of the entry
-        DLLEXPORT AlphaFeld* getMsAuswAlphaFeld(int i) const;
+        DLLEXPORT AlphaField* getMsSelAlphaField(int i) const;
         //! Returns the color gradient without increased reference counter used
         //! with the MultiStyled flag when selecting a specific entry
         //! \param i The index of the entry
-        DLLEXPORT AlphaFeld* zMsAuswAlphaFeld(int i) const;
+        DLLEXPORT AlphaField* zMsSelAlphaField(int i) const;
         //! Returns the color of the color gradient in A8R8G8B8 format used with
         //! the MultiStyled flag when selecting a specific entry
         //! \param i The index of the entry
@@ -530,10 +530,10 @@ namespace Framework
         DLLEXPORT int getMausRahmenBreite() const;
         //! Returns the color gradient used when the mouse is pointing
         //! at an entry
-        DLLEXPORT AlphaFeld* getMausAlphaFeld() const;
+        DLLEXPORT AlphaField* getMouseAlphaField() const;
         //! Returns the color gradient without increased reference counter used
         //! when the mouse is pointing at an entry
-        DLLEXPORT AlphaFeld* zMausAlphaFeld() const;
+        DLLEXPORT AlphaField* zMouseAlphaField() const;
         //! Returns the color of the color gradient in A8R8G8B8 format used
         //! when the mouse is pointing at an entry
         DLLEXPORT int getMausAlphaFeldFarbe() const;
@@ -567,11 +567,11 @@ namespace Framework
         //! Returns the color gradient used with the Multistyle flag when
         //! the mouse is pointing at a specific entry \param i The index
         //! of the entry
-        DLLEXPORT AlphaFeld* getMsMausAlphaFeld(int i) const;
+        DLLEXPORT AlphaField* getMsMouseAlphaField(int i) const;
         //! Returns the color gradient without increased reference counter used
         //! with the Multistyle flag when the mouse is pointing at a specific
         //! entry \param i The index of the entry
-        DLLEXPORT AlphaFeld* zMsMausAlphaFeld(int i) const;
+        DLLEXPORT AlphaField* zMsMouseAlphaField(int i) const;
         //! Returns the color of the color gradient in A8R8G8B8 format used with
         //! the Multistyle flag when the mouse is pointing at a specific entry
         //! \param i The index of the entry

Shader.cpp

@@ -73,11 +73,11 @@ ShaderType Shader::getType() const
 //! Returns the index of the first uninitialized buffer
 int Shader::getFirstUninitializedBufferIndex() const
 {
-    for (int index = 0; index < constBuffers->getEintragAnzahl(); index++)
+    for (int index = 0; index < constBuffers->getEntryCount(); index++)
     {
         if (!constBuffers->hat(index) || !constBuffers->z(index)) return index;
     }
-    return constBuffers->getEintragAnzahl();
+    return constBuffers->getEntryCount();
 }
 
 DX11Shader::DX11Shader(ID3D11Device* device, ID3D11DeviceContext* context)

Slider.cpp

@@ -26,7 +26,7 @@ float Slider::getValue() const
 
 // Processes a mouse event. Called automatically by the framework.
 //  me: the event
-void Slider::doMausEreignis(MausEreignis& me, bool userRet)
+void Slider::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (gr.x
         && (me.id == ME_PLinks
@@ -37,7 +37,7 @@ void Slider::doMausEreignis(MausEreignis& me, bool userRet)
         if (value > 100) value = 100;
         rend |= 1;
     }
-    DrawableBackground::doMausEreignis(me, userRet);
+    DrawableBackground::doMouseEvent(me, userRet);
 }
 
 // renders the drawing into a specific image

Slider.h

@@ -16,7 +16,7 @@ namespace Framework
         DLLEXPORT float getValue() const;
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The event
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
         //! Draws the drawing into a specific image
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;

Table.cpp

@@ -11,9 +11,9 @@
 
 using namespace Framework;
 
-// Contents of the ObjTabelle class from Table.h
+// Contents of the ObjTable class from Table.h
 // Constructor
-ObjTabelle::ObjTabelle()
+ObjTable::ObjTable()
     : DrawableBackground(),
       members(new RCArray<RCArray<Drawable>>()),
       spaltenNamen(new RCArray<Text>()),
@@ -38,7 +38,7 @@ ObjTabelle::ObjTabelle()
       aRam(0),
       aAf(0),
       msaRam(new RCArray<RCArray<Border>>()),
-      msaAf(new RCArray<RCArray<AlphaFeld>>()),
+      msaAf(new RCArray<RCArray<AlphaField>>()),
       styles(new RCArray<Array<__int64>>())
 {
     style = Style::MEIgnoreInside | Style::MEIgnoreParentInside
@@ -46,7 +46,7 @@ ObjTabelle::ObjTabelle()
 }
 
 // Destructor
-ObjTabelle::~ObjTabelle()
+ObjTable::~ObjTable()
 {
     if (members) members->release();
     if (spaltenNamen) spaltenNamen->release();
@@ -64,8 +64,8 @@ ObjTabelle::~ObjTabelle()
     if (styles) styles->release();
 }
 
-void ObjTabelle::doMausEreignis(
-    MausEreignis& me, bool userRet) // processes mouse events
+void ObjTable::doMouseEvent(
+    MouseEvent& me, bool userRet) // processes mouse events
 {
     if (!hatStyle(Style::Sichtbar) || !me.insideParent || me.verarbeitet
         || me.mx < 0 || me.my < 0 || me.mx >= gr.x || me.my >= gr.y || !userRet)
@@ -94,7 +94,7 @@ void ObjTabelle::doMausEreignis(
                 for (int j = 0; j < spaltenAnzahl; ++j)
                 {
                     Drawable* obj = zDrawable(j, i);
-                    if (obj) obj->doPublicMausEreignis(me);
+                    if (obj) obj->doPublicMouseEvent(me);
                 }
             }
         }
@@ -259,7 +259,7 @@ void ObjTabelle::doMausEreignis(
             {
                 bool b = me.verarbeitet;
                 Drawable* obj = zDrawable(j, i);
-                if (obj) obj->doPublicMausEreignis(me);
+                if (obj) obj->doPublicMouseEvent(me);
                 if (!b && me.verarbeitet && me.id == ME_PLinks)
                     selected = Punkt(j, i);
             }
@@ -272,17 +272,17 @@ void ObjTabelle::doMausEreignis(
 }
 
 // non-constant
-void ObjTabelle::addSpalte(const char* name) // add column
+void ObjTable::addSpalte(const char* name) // add column
 {
     addSpalte(spaltenAnzahl, name);
 }
 
-void ObjTabelle::addSpalte(Text* name)
+void ObjTable::addSpalte(Text* name)
 {
     addSpalte(spaltenAnzahl, name);
 }
 
-void ObjTabelle::addSpalte(int sNum, const char* name) // insert column at sNum
+void ObjTable::addSpalte(int sNum, const char* name) // insert column at sNum
 {
     if (sNum > spaltenAnzahl) return;
     lockDrawable();
@@ -292,7 +292,7 @@ void ObjTabelle::addSpalte(int sNum, const char* name) // insert column at sNum
     minSpaltenBreite->add(0, sNum);
     maxSpaltenBreite->add(300, sNum);
     msaRam->add(new RCArray<Border>(), sNum);
-    msaAf->add(new RCArray<AlphaFeld>(), sNum);
+    msaAf->add(new RCArray<AlphaField>(), sNum);
     styles->add(new Array<__int64>(), sNum);
     for (int i = 0; i < zeilenAnzahl; i++)
     {
@@ -306,23 +306,23 @@ void ObjTabelle::addSpalte(int sNum, const char* name) // insert column at sNum
     unlockDrawable();
 }
 
-void ObjTabelle::addSpalte(int sNum, Text* name)
+void ObjTable::addSpalte(int sNum, Text* name)
 {
     addSpalte(sNum, name->getText());
     name->release();
 }
 
-void ObjTabelle::addZeile(const char* name) // add row
+void ObjTable::addZeile(const char* name) // add row
 {
     addZeile(zeilenAnzahl, name);
 }
 
-void ObjTabelle::addZeile(Text* name)
+void ObjTable::addZeile(Text* name)
 {
     addZeile(zeilenAnzahl, name);
 }
 
-void ObjTabelle::addZeile(int zNum, const char* name) // insert row at zNum
+void ObjTable::addZeile(int zNum, const char* name) // insert row at zNum
 {
     if (zNum > zeilenAnzahl) return;
     lockDrawable();
@@ -342,13 +342,13 @@ void ObjTabelle::addZeile(int zNum, const char* name) // insert row at zNum
     unlockDrawable();
 }
 
-void ObjTabelle::addZeile(int zNum, Text* name)
+void ObjTable::addZeile(int zNum, Text* name)
 {
     addZeile(zNum, name->getText());
     name->release();
 }
 
-void ObjTabelle::removeSpalte(int sNum) // delete column
+void ObjTable::removeSpalte(int sNum) // delete column
 {
     if (sNum >= spaltenAnzahl) return;
     lockDrawable();
@@ -367,17 +367,17 @@ void ObjTabelle::removeSpalte(int sNum) // delete column
     unlockDrawable();
 }
 
-void ObjTabelle::removeSpalte(const char* name)
+void ObjTable::removeSpalte(const char* name)
 {
     removeSpalte(getSpaltenNummer(name));
 }
 
-void ObjTabelle::removeSpalte(Text* name)
+void ObjTable::removeSpalte(Text* name)
 {
     removeSpalte(getSpaltenNummer(name));
 }
 
-void ObjTabelle::removeZeile(int zNum) // delete row
+void ObjTable::removeZeile(int zNum) // delete row
 {
     if (zNum >= zeilenAnzahl) return;
     lockDrawable();
@@ -397,28 +397,28 @@ void ObjTabelle::removeZeile(int zNum) // delete row
     unlockDrawable();
 }
 
-void ObjTabelle::removeZeile(const char* name)
+void ObjTable::removeZeile(const char* name)
 {
     removeZeile(getZeilenNummer(name));
 }
 
-void ObjTabelle::removeZeile(Text* name)
+void ObjTable::removeZeile(Text* name)
 {
     removeZeile(getZeilenNummer(name));
 }
 
-void ObjTabelle::setSpaltePosition(
+void ObjTable::setSpaltePosition(
     const char* name, int pos) // sets the position of a column
 {
     setSpaltePosition(getSpaltenNummer(name), pos);
 }
 
-void ObjTabelle::setSpaltePosition(Text* name, int pos)
+void ObjTable::setSpaltePosition(Text* name, int pos)
 {
     setSpaltePosition(getSpaltenNummer(name), pos);
 }
 
-void ObjTabelle::setSpaltePosition(int sNum, int pos)
+void ObjTable::setSpaltePosition(int sNum, int pos)
 {
     if (sNum >= spaltenAnzahl || pos >= spaltenAnzahl || sNum == pos) return;
     int delPos = sNum;
@@ -449,18 +449,18 @@ void ObjTabelle::setSpaltePosition(int sNum, int pos)
     unlockDrawable();
 }
 
-void ObjTabelle::setZeilePosition(
+void ObjTable::setZeilePosition(
     const char* name, int pos) // sets the row position
 {
     setZeilePosition(getZeilenNummer(name), pos);
 }
 
-void ObjTabelle::setZeilePosition(Text* name, int pos)
+void ObjTable::setZeilePosition(Text* name, int pos)
 {
     setZeilePosition(getZeilenNummer(name), pos);
 }
 
-void ObjTabelle::setZeilePosition(int zNum, int pos)
+void ObjTable::setZeilePosition(int zNum, int pos)
 {
     if (zNum >= zeilenAnzahl || pos >= zeilenAnzahl || pos == zNum) return;
     int delPos = zNum;
@@ -514,13 +514,13 @@ void ObjTabelle::setZeilePosition(int zNum, int pos)
     unlockDrawable();
 }
 
-void ObjTabelle::setDrawableZ(
+void ObjTable::setDrawableZ(
     int sNum, int zNum, Drawable* obj) // sets a drawing
 {
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
     lockDrawable();
     if (!members->z(sNum)) members->set(new RCArray<Drawable>(), sNum);
-    while (members->z(sNum)->getEintragAnzahl() <= zNum)
+    while (members->z(sNum)->getEntryCount() <= zNum)
         members->z(sNum)->add(0);
     members->z(sNum)->set(obj, zNum);
     if (spaltenBreite->hat(sNum))
@@ -535,21 +535,21 @@ void ObjTabelle::setDrawableZ(
     unlockDrawable();
 }
 
-void ObjTabelle::setDrawableZ(
+void ObjTable::setDrawableZ(
     const char* spaltenName, const char* zeilenName, Drawable* zDrawable)
 {
     setDrawableZ(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), zDrawable);
 }
 
-void ObjTabelle::setDrawableZ(
+void ObjTable::setDrawableZ(
     Text* spaltenName, Text* zeilenName, Drawable* zDrawable)
 {
     setDrawableZ(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), zDrawable);
 }
 
-void ObjTabelle::setSpaltenBreite(int sNum, int br) // sets the column width
+void ObjTable::setSpaltenBreite(int sNum, int br) // sets the column width
 {
     if (sNum >= spaltenAnzahl) return;
     lockDrawable();
@@ -558,17 +558,17 @@ void ObjTabelle::setSpaltenBreite(int sNum, int br) // sets the column width
     unlockDrawable();
 }
 
-void ObjTabelle::setSpaltenBreite(const char* name, int br)
+void ObjTable::setSpaltenBreite(const char* name, int br)
 {
     setSpaltenBreite(getSpaltenNummer(name), br);
 }
 
-void ObjTabelle::setSpaltenBreite(Text* name, int br)
+void ObjTable::setSpaltenBreite(Text* name, int br)
 {
     setSpaltenBreite(getSpaltenNummer(name), br);
 }
 
-void ObjTabelle::setZeilenHeight(int zNum, int hi) // sets the row height
+void ObjTable::setZeilenHeight(int zNum, int hi) // sets the row height
 {
     if (zNum >= zeilenAnzahl) return;
     lockDrawable();
@@ -577,17 +577,17 @@ void ObjTabelle::setZeilenHeight(int zNum, int hi) // sets the row height
     unlockDrawable();
 }
 
-void ObjTabelle::setZeilenHeight(const char* name, int hi)
+void ObjTable::setZeilenHeight(const char* name, int hi)
 {
     setZeilenHeight(getZeilenNummer(name), hi);
 }
 
-void ObjTabelle::setZeilenHeight(Text* name, int hi)
+void ObjTable::setZeilenHeight(Text* name, int hi)
 {
     setZeilenHeight(getZeilenNummer(name), hi);
 }
 
-void ObjTabelle::setMinSpaltenBreite(
+void ObjTable::setMinSpaltenBreite(
     int sNum, int minBr) // sets the minimum column width
 {
     if (sNum >= spaltenAnzahl) return;
@@ -597,17 +597,17 @@ void ObjTabelle::setMinSpaltenBreite(
     unlockDrawable();
 }
 
-void ObjTabelle::setMinSpaltenBreite(const char* name, int minBr)
+void ObjTable::setMinSpaltenBreite(const char* name, int minBr)
 {
     setMinSpaltenBreite(getSpaltenNummer(name), minBr);
 }
 
-void ObjTabelle::setMinSpaltenBreite(Text* name, int minBr)
+void ObjTable::setMinSpaltenBreite(Text* name, int minBr)
 {
     setMinSpaltenBreite(getSpaltenNummer(name), minBr);
 }
 
-void ObjTabelle::setMaxSpaltenBreite(
+void ObjTable::setMaxSpaltenBreite(
     int sNum, int maxBr) // sets the maximum column width
 {
     if (sNum >= spaltenAnzahl) return;
@@ -617,17 +617,17 @@ void ObjTabelle::setMaxSpaltenBreite(
     unlockDrawable();
 }
 
-void ObjTabelle::setMaxSpaltenBreite(const char* name, int maxBr)
+void ObjTable::setMaxSpaltenBreite(const char* name, int maxBr)
 {
     setMaxSpaltenBreite(getSpaltenNummer(name), maxBr);
 }
 
-void ObjTabelle::setMaxSpaltenBreite(Text* name, int maxBr)
+void ObjTable::setMaxSpaltenBreite(Text* name, int maxBr)
 {
     setMaxSpaltenBreite(getSpaltenNummer(name), maxBr);
 }
 
-void ObjTabelle::setMinZeilenHeight(
+void ObjTable::setMinZeilenHeight(
     int zNum, int minHi) // sets the minimum row height
 {
     if (zNum >= zeilenAnzahl) return;
@@ -637,17 +637,17 @@ void ObjTabelle::setMinZeilenHeight(
     unlockDrawable();
 }
 
-void ObjTabelle::setMinZeilenHeight(const char* name, int minHi)
+void ObjTable::setMinZeilenHeight(const char* name, int minHi)
 {
     setMinZeilenHeight(getZeilenNummer(name), minHi);
 }
 
-void ObjTabelle::setMinZeilenHeight(Text* name, int minHi)
+void ObjTable::setMinZeilenHeight(Text* name, int minHi)
 {
     setMinZeilenHeight(getZeilenNummer(name), minHi);
 }
 
-void ObjTabelle::setMaxZeilenHeight(
+void ObjTable::setMaxZeilenHeight(
     int zNum, int maxHi) // sets the maximum row height
 {
     if (zNum >= zeilenAnzahl) return;
@@ -657,17 +657,17 @@ void ObjTabelle::setMaxZeilenHeight(
     unlockDrawable();
 }
 
-void ObjTabelle::setMaxZeilenHeight(const char* name, int maxHi)
+void ObjTable::setMaxZeilenHeight(const char* name, int maxHi)
 {
     setMaxZeilenHeight(getZeilenHeight(name), maxHi);
 }
 
-void ObjTabelle::setMaxZeilenHeight(Text* name, int maxHi)
+void ObjTable::setMaxZeilenHeight(Text* name, int maxHi)
 {
     setMaxZeilenHeight(getZeilenHeight(name), maxHi);
 }
 
-void ObjTabelle::setAuswahl(
+void ObjTable::setAuswahl(
     int sNum, int zNum) // selects the corresponding field
 {
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
@@ -678,92 +678,92 @@ void ObjTabelle::setAuswahl(
     unlockDrawable();
 }
 
-void ObjTabelle::setAuswahl(const char* spaltenName, const char* zeilenName)
+void ObjTable::setAuswahl(const char* spaltenName, const char* zeilenName)
 {
     setAuswahl(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-void ObjTabelle::setAuswahl(Text* spaltenName, Text* zeilenName)
+void ObjTable::setAuswahl(Text* spaltenName, Text* zeilenName)
 {
     setAuswahl(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-void ObjTabelle::setRasterFarbe(int f) // sets the grid color
+void ObjTable::setRasterFarbe(int f) // sets the grid color
 {
     rasterFarbe = f;
     rend = 1;
 }
 
-void ObjTabelle::setRasterBreite(int br) // sets the width of the grid
+void ObjTable::setRasterBreite(int br) // sets the width of the grid
 {
     rasterBreite = br;
     rend = 1;
 }
 
-void ObjTabelle::setABorderZ(Border* ram) // sets the selection border
+void ObjTable::setABorderZ(Border* ram) // sets the selection border
 {
     if (aRam) aRam->release();
     aRam = ram;
     rend = 1;
 }
 
-void ObjTabelle::setARFarbe(int f) // sets the selection border color
+void ObjTable::setARFarbe(int f) // sets the selection border color
 {
     if (!aRam) aRam = new LBorder();
     aRam->setFarbe(f);
     rend = 1;
 }
 
-void ObjTabelle::setARBreite(int br) // sets the selection border width
+void ObjTable::setARBreite(int br) // sets the selection border width
 {
     if (!aRam) aRam = new LBorder();
     aRam->setRamenBreite(br);
     rend = 1;
 }
 
-void ObjTabelle::setAAlphaFeldZ(AlphaFeld* af) // sets the selection AlphaFeld
+void ObjTable::setAAlphaFieldZ(AlphaField* af) // sets the selection AlphaField
 {
     if (aAf) aAf->release();
     aAf = af;
     rend = 1;
 }
 
-void ObjTabelle::setAAfFarbe(int f) // sets the color of the selection AlphaFeld
+void ObjTable::setAAfFarbe(int f) // sets the color of the selection AlphaField
 {
-    if (!aAf) aAf = new AlphaFeld();
+    if (!aAf) aAf = new AlphaField();
     aAf->setFarbe(f);
     rend = 1;
 }
 
-void ObjTabelle::setAAfStrength(
-    int st) // sets the strength of the selection AlphaFeld
+void ObjTable::setAAfStrength(
+    int st) // sets the strength of the selection AlphaField
 {
-    if (!aAf) aAf = new AlphaFeld();
+    if (!aAf) aAf = new AlphaField();
     aAf->setStrength(st);
     rend = 1;
 }
 
-void ObjTabelle::setABorderZ(
+void ObjTable::setABorderZ(
     int sNum, int zNum, Border* ram) // sets the selection border
 {
     if (msaRam->z(sNum)) msaRam->z(sNum)->set(ram, zNum);
     rend = 1;
 }
 
-void ObjTabelle::setABorderZ(
+void ObjTable::setABorderZ(
     const char* spaltenName, const char* zeilenName, Border* ram)
 {
     setABorderZ(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), ram);
 }
 
-void ObjTabelle::setABorderZ(Text* spaltenName, Text* zeilenName, Border* ram)
+void ObjTable::setABorderZ(Text* spaltenName, Text* zeilenName, Border* ram)
 {
     setABorderZ(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), ram);
 }
 
-void ObjTabelle::setARFarbe(
+void ObjTable::setARFarbe(
     int sNum, int zNum, int f) // sets the selection border color
 {
     if (msaRam->z(sNum))
@@ -779,18 +779,18 @@ void ObjTabelle::setARFarbe(
     }
 }
 
-void ObjTabelle::setARFarbe(
+void ObjTable::setARFarbe(
     const char* spaltenName, const char* zeilenName, int f)
 {
     setARFarbe(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), f);
 }
 
-void ObjTabelle::setARFarbe(Text* spaltenName, Text* zeilenName, int f)
+void ObjTable::setARFarbe(Text* spaltenName, Text* zeilenName, int f)
 {
     setARFarbe(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), f);
 }
 
-void ObjTabelle::setARBreite(
+void ObjTable::setARBreite(
     int sNum, int zNum, int br) // sets the selection border width
 {
     if (msaRam->z(sNum))
@@ -806,47 +806,47 @@ void ObjTabelle::setARBreite(
     }
 }
 
-void ObjTabelle::setARBreite(
+void ObjTable::setARBreite(
     const char* spaltenName, const char* zeilenName, int br)
 {
     setARBreite(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), br);
 }
 
-void ObjTabelle::setARBreite(Text* spaltenName, Text* zeilenName, int br)
+void ObjTable::setARBreite(Text* spaltenName, Text* zeilenName, int br)
 {
     setARBreite(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), br);
 }
 
-void ObjTabelle::setAAlphaFeldZ(
-    int sNum, int zNum, AlphaFeld* af) // sets the selection AlphaFeld
+void ObjTable::setAAlphaFieldZ(
+    int sNum, int zNum, AlphaField* af) // sets the selection AlphaField
 {
     if (msaAf->z(sNum)) msaAf->z(sNum)->set(af, zNum);
     rend = 1;
 }
 
-void ObjTabelle::setAAlphaFeldZ(
-    const char* spaltenName, const char* zeilenName, AlphaFeld* af)
+void ObjTable::setAAlphaFieldZ(
+    const char* spaltenName, const char* zeilenName, AlphaField* af)
 {
-    setAAlphaFeldZ(
+    setAAlphaFieldZ(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), af);
 }
 
-void ObjTabelle::setAAlphaFeldZ(
-    Text* spaltenName, Text* zeilenName, AlphaFeld* af)
+void ObjTable::setAAlphaFieldZ(
+    Text* spaltenName, Text* zeilenName, AlphaField* af)
 {
-    setAAlphaFeldZ(
+    setAAlphaFieldZ(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), af);
 }
 
-void ObjTabelle::setAAfFarbe(
-    int sNum, int zNum, int f) // sets the color of the selection AlphaFeld
+void ObjTable::setAAfFarbe(
+    int sNum, int zNum, int f) // sets the color of the selection AlphaField
 {
     if (msaAf->z(sNum))
     {
-        AlphaFeld* tmp = msaAf->z(sNum)->z(zNum);
+        AlphaField* tmp = msaAf->z(sNum)->z(zNum);
         if (!tmp)
         {
-            tmp = new AlphaFeld();
+            tmp = new AlphaField();
             msaAf->z(sNum)->set(tmp, zNum);
         }
         tmp->setFarbe(f);
@@ -854,26 +854,26 @@ void ObjTabelle::setAAfFarbe(
     }
 }
 
-void ObjTabelle::setAAfFarbe(
+void ObjTable::setAAfFarbe(
     const char* spaltenName, const char* zeilenName, int f)
 {
     setAAfFarbe(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), f);
 }
 
-void ObjTabelle::setAAfFarbe(Text* spaltenName, Text* zeilenName, int f)
+void ObjTable::setAAfFarbe(Text* spaltenName, Text* zeilenName, int f)
 {
     setAAfFarbe(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), f);
 }
 
-void ObjTabelle::setAAfStrength(
-    int sNum, int zNum, int st) // sets the strength of the selection AlphaFeld
+void ObjTable::setAAfStrength(
+    int sNum, int zNum, int st) // sets the strength of the selection AlphaField
 {
     if (msaAf->z(sNum))
     {
-        AlphaFeld* tmp = msaAf->z(sNum)->z(zNum);
+        AlphaField* tmp = msaAf->z(sNum)->z(zNum);
         if (!tmp)
         {
-            tmp = new AlphaFeld();
+            tmp = new AlphaField();
             msaAf->z(sNum)->set(tmp, zNum);
         }
         tmp->setStrength(st);
@@ -881,20 +881,20 @@ void ObjTabelle::setAAfStrength(
     }
 }
 
-void ObjTabelle::setAAfStrength(
+void ObjTable::setAAfStrength(
     const char* spaltenName, const char* zeilenName, int st)
 {
     setAAfStrength(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), st);
 }
 
-void ObjTabelle::setAAfStrength(Text* spaltenName, Text* zeilenName, int st)
+void ObjTable::setAAfStrength(Text* spaltenName, Text* zeilenName, int st)
 {
     setAAfStrength(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), st);
 }
 
-void ObjTabelle::addMsStyle(
+void ObjTable::addMsStyle(
     int sNum, int zNum, __int64 style) // sets the style when Multistyled
 {
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
@@ -906,40 +906,40 @@ void ObjTabelle::addMsStyle(
     rend = 1;
 }
 
-void ObjTabelle::addMsStyle(
+void ObjTable::addMsStyle(
     const char* spaltenName, const char* zeilenName, __int64 style)
 {
     addMsStyle(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-void ObjTabelle::addMsStyle(Text* spaltenName, Text* zeilenName, __int64 style)
+void ObjTable::addMsStyle(Text* spaltenName, Text* zeilenName, __int64 style)
 {
     addMsStyle(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-void ObjTabelle::setMsStyle(int sNum, int zNum, __int64 style)
+void ObjTable::setMsStyle(int sNum, int zNum, __int64 style)
 {
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
     if (styles->z(sNum)) styles->z(sNum)->set(style, zNum);
     rend = 1;
 }
 
-void ObjTabelle::setMsStyle(
+void ObjTable::setMsStyle(
     const char* spaltenName, const char* zeilenName, __int64 style)
 {
     setMsStyle(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-void ObjTabelle::setMsStyle(Text* spaltenName, Text* zeilenName, __int64 style)
+void ObjTable::setMsStyle(Text* spaltenName, Text* zeilenName, __int64 style)
 {
     setMsStyle(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-void ObjTabelle::setMsStyle(int sNum, int zNum, __int64 style, bool add_remove)
+void ObjTable::setMsStyle(int sNum, int zNum, __int64 style, bool add_remove)
 {
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
     if (styles->z(sNum))
@@ -958,7 +958,7 @@ void ObjTabelle::setMsStyle(int sNum, int zNum, __int64 style, bool add_remove)
     }
 }
 
-void ObjTabelle::setMsStyle(const char* spaltenName,
+void ObjTable::setMsStyle(const char* spaltenName,
     const char* zeilenName,
     __int64 style,
     bool add_remove)
@@ -969,7 +969,7 @@ void ObjTabelle::setMsStyle(const char* spaltenName,
         add_remove);
 }
 
-void ObjTabelle::setMsStyle(
+void ObjTable::setMsStyle(
     Text* spaltenName, Text* zeilenName, __int64 style, bool add_remove)
 {
     setMsStyle(getSpaltenNummer(spaltenName),
@@ -978,7 +978,7 @@ void ObjTabelle::setMsStyle(
         add_remove);
 }
 
-void ObjTabelle::removeMsStyle(int sNum, int zNum, __int64 style)
+void ObjTable::removeMsStyle(int sNum, int zNum, __int64 style)
 {
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
     if (styles->z(sNum))
@@ -989,21 +989,21 @@ void ObjTabelle::removeMsStyle(int sNum, int zNum, __int64 style)
     rend = 1;
 }
 
-void ObjTabelle::removeMsStyle(
+void ObjTable::removeMsStyle(
     const char* spaltenName, const char* zeilenName, __int64 style)
 {
     removeMsStyle(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-void ObjTabelle::removeMsStyle(
+void ObjTable::removeMsStyle(
     Text* spaltenName, Text* zeilenName, __int64 style)
 {
     removeMsStyle(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-bool ObjTabelle::tick(double tickVal) // tick Message
+bool ObjTable::tick(double tickVal) // tick Message
 {
     lockDrawable();
     for (int i = 0; i < zeilenAnzahl; ++i)
@@ -1018,7 +1018,7 @@ bool ObjTabelle::tick(double tickVal) // tick Message
     return DrawableBackground::tick(tickVal);
 }
 
-void ObjTabelle::doTastaturEreignis(TastaturEreignis& te)
+void ObjTable::doKeyboardEvent(KeyboardEvent& te)
 {
     bool ntakc = !te.verarbeitet;
     if (hatStyleNicht(Style::Fokus) || hatStyleNicht(Style::Erlaubt)
@@ -1029,7 +1029,7 @@ void ObjTabelle::doTastaturEreignis(TastaturEreignis& te)
         lockDrawable();
         if (zDrawable(selected.x, selected.y))
         {
-            zDrawable(selected.x, selected.y)->doTastaturEreignis(te);
+            zDrawable(selected.x, selected.y)->doKeyboardEvent(te);
             if (!te.verarbeitet && te.id == TE_Press)
             {
                 if (te.virtualKey == T_Oben)
@@ -1061,7 +1061,7 @@ void ObjTabelle::doTastaturEreignis(TastaturEreignis& te)
         te.verarbeitet = nTak(ntakParam, this, te);
 }
 
-void ObjTabelle::render(Image& zRObj) // renders the table into zRObj
+void ObjTable::render(Image& zRObj) // renders the table into zRObj
 {
     if (hatStyleNicht(Style::Sichtbar)) return;
     DrawableBackground::render(zRObj);
@@ -1113,13 +1113,13 @@ void ObjTabelle::render(Image& zRObj) // renders the table into zRObj
                 if (selected.x == s && selected.y == z)
                 {
                     Border* tmp_aRam = aRam;
-                    AlphaFeld* tmp_aAf = aAf;
+                    AlphaField* tmp_aAf = aAf;
                     bool aRamB = hatStyle(Style::SelectionBorder) && tmp_aRam;
                     bool aAfB = hatStyle(Style::AuswahlBuffer) && tmp_aAf;
                     if (hatStyle(Style::AuswahlMultistyled))
                     {
                         tmp_aRam = getABorder(s, z);
-                        tmp_aAf = getAAlphaFeld(s, z);
+                        tmp_aAf = getAAlphaField(s, z);
                         aRamB = hatMsStyle(s, z, Style::SelectionBorder)
                              && tmp_aRam;
                         aAfB
@@ -1159,17 +1159,17 @@ void ObjTabelle::render(Image& zRObj) // renders the table into zRObj
 }
 
 // constant
-int ObjTabelle::getSpaltenAnzahl() const // returns the number of columns
+int ObjTable::getSpaltenAnzahl() const // returns the number of columns
 {
     return spaltenAnzahl;
 }
 
-int ObjTabelle::getZeilenAnzahl() const // returns the number of rows
+int ObjTable::getZeilenAnzahl() const // returns the number of rows
 {
     return zeilenAnzahl;
 }
 
-int ObjTabelle::getSpaltenNummer(
+int ObjTable::getSpaltenNummer(
     const char* name) const // returns the index of the column with the name
 {
     for (int i = 0; i < spaltenAnzahl; ++i)
@@ -1179,25 +1179,25 @@ int ObjTabelle::getSpaltenNummer(
     return -1;
 }
 
-int ObjTabelle::getSpaltenNummer(Text* name) const
+int ObjTable::getSpaltenNummer(Text* name) const
 {
     int ret = getSpaltenNummer(name->getText());
     name->release();
     return ret;
 }
 
-Text* ObjTabelle::getSpaltenName(
+Text* ObjTable::getSpaltenName(
     int num) const // returns the name of the column with index num
 {
     return spaltenNamen->get(num);
 }
 
-Text* ObjTabelle::zSpaltenName(int num) const
+Text* ObjTable::zSpaltenName(int num) const
 {
     return spaltenNamen->z(num);
 }
 
-int ObjTabelle::getZeilenNummer(
+int ObjTable::getZeilenNummer(
     const char* name) const // returns the index of the row with the name
 {
     for (int i = 0; i < zeilenAnzahl; ++i)
@@ -1207,25 +1207,25 @@ int ObjTabelle::getZeilenNummer(
     return -1;
 }
 
-int ObjTabelle::getZeilenNummer(Text* name) const
+int ObjTable::getZeilenNummer(Text* name) const
 {
     int ret = getZeilenNummer(name->getText());
     name->release();
     return ret;
 }
 
-Text* ObjTabelle::getZeilenName(
+Text* ObjTable::getZeilenName(
     int num) const // returns the name of the row with index num
 {
     return zeilenNamen->get(num);
 }
 
-Text* ObjTabelle::zZeilenName(int num) const
+Text* ObjTable::zZeilenName(int num) const
 {
     return zeilenNamen->z(num);
 }
 
-Punkt ObjTabelle::getDrawablePosition(
+Punkt ObjTable::getDrawablePosition(
     Drawable* zObj) const // returns the position of a drawing
 {
     for (int x = 0; x < spaltenAnzahl; ++x)
@@ -1238,7 +1238,7 @@ Punkt ObjTabelle::getDrawablePosition(
     return Punkt(-1, -1);
 }
 
-Drawable* ObjTabelle::zDrawable(
+Drawable* ObjTable::zDrawable(
     int sNum, int zNum) const // returns the drawing at the position
 {
     if (sNum < 0 || zNum < 0 || sNum >= spaltenAnzahl || zNum >= zeilenAnzahl)
@@ -1249,20 +1249,20 @@ Drawable* ObjTabelle::zDrawable(
     return tmp ? tmp->z(zNum) : 0;
 }
 
-Drawable* ObjTabelle::zDrawable(
+Drawable* ObjTable::zDrawable(
     const char* spaltenName, const char* zeilenName) const
 {
     return zDrawable(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Drawable* ObjTabelle::zDrawable(Text* spaltenName, Text* zeilenName) const
+Drawable* ObjTable::zDrawable(Text* spaltenName, Text* zeilenName) const
 {
     return zDrawable(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Drawable* ObjTabelle::getDrawable(
+Drawable* ObjTable::getDrawable(
     int sNum, int zNum) const // returns the drawing at the position
 {
     if (!members->z(sNum)) return 0;
@@ -1271,115 +1271,115 @@ Drawable* ObjTabelle::getDrawable(
     return tmp ? tmp->get(zNum) : 0;
 }
 
-Drawable* ObjTabelle::getDrawable(
+Drawable* ObjTable::getDrawable(
     const char* spaltenName, const char* zeilenName) const
 {
     return getDrawable(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Drawable* ObjTabelle::getDrawable(Text* spaltenName, Text* zeilenName) const
+Drawable* ObjTable::getDrawable(Text* spaltenName, Text* zeilenName) const
 {
     return getDrawable(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-int ObjTabelle::getSpaltenBreite(
+int ObjTable::getSpaltenBreite(
     int num) const // returns the width of the column
 {
     return spaltenBreite->get(num);
 }
 
-int ObjTabelle::getSpaltenBreite(const char* name) const
+int ObjTable::getSpaltenBreite(const char* name) const
 {
     return getSpaltenBreite(getSpaltenNummer(name));
 }
 
-int ObjTabelle::getSpaltenBreite(Text* name) const
+int ObjTable::getSpaltenBreite(Text* name) const
 {
     return getSpaltenBreite(getSpaltenNummer(name));
 }
 
-int ObjTabelle::getZeilenHeight(int num) const // returns the height of the row
+int ObjTable::getZeilenHeight(int num) const // returns the height of the row
 {
     return zeilenHeight->get(num);
 }
 
-int ObjTabelle::getZeilenHeight(const char* name) const
+int ObjTable::getZeilenHeight(const char* name) const
 {
     return getZeilenHeight(getZeilenNummer(name));
 }
 
-int ObjTabelle::getZeilenHeight(Text* name) const
+int ObjTable::getZeilenHeight(Text* name) const
 {
     return getZeilenHeight(getZeilenNummer(name));
 }
 
-int ObjTabelle::getMinSpaltenBreite(
+int ObjTable::getMinSpaltenBreite(
     int num) const // returns the minimum column width
 {
     return minSpaltenBreite->get(num);
 }
 
-int ObjTabelle::getMinSpaltenBreite(const char* name) const
+int ObjTable::getMinSpaltenBreite(const char* name) const
 {
     return getMinSpaltenBreite(getSpaltenNummer(name));
 }
 
-int ObjTabelle::getMinSpaltenBreite(Text* name) const
+int ObjTable::getMinSpaltenBreite(Text* name) const
 {
     return getMinSpaltenBreite(getSpaltenNummer(name));
 }
 
-int ObjTabelle::getMaxSpaltenBreite(
+int ObjTable::getMaxSpaltenBreite(
     int num) const // returns the maximum column width
 {
     return maxSpaltenBreite->get(num);
 }
 
-int ObjTabelle::getMaxSpaltenBreite(const char* name) const
+int ObjTable::getMaxSpaltenBreite(const char* name) const
 {
     return getMaxSpaltenBreite(getSpaltenNummer(name));
 }
 
-int ObjTabelle::getMaxSpaltenBreite(Text* name) const
+int ObjTable::getMaxSpaltenBreite(Text* name) const
 {
     return getMaxSpaltenBreite(getSpaltenNummer(name));
 }
 
-int ObjTabelle::getMinZeilenHeight(
+int ObjTable::getMinZeilenHeight(
     int num) const // returns the minimum row height
 {
     return minZeilenHeight->get(num);
 }
 
-int ObjTabelle::getMinZeilenHeight(const char* name) const
+int ObjTable::getMinZeilenHeight(const char* name) const
 {
     return getMinZeilenHeight(getZeilenNummer(name));
 }
 
-int ObjTabelle::getMinZeilenHeight(Text* name) const
+int ObjTable::getMinZeilenHeight(Text* name) const
 {
     return getMinZeilenHeight(getZeilenNummer(name));
 }
 
-int ObjTabelle::getMaxZeilenHeight(
+int ObjTable::getMaxZeilenHeight(
     int num) const // returns the maximum row height
 {
     return maxZeilenHeight->get(num);
 }
 
-int ObjTabelle::getMaxZeilenHeight(const char* name) const
+int ObjTable::getMaxZeilenHeight(const char* name) const
 {
     return getMaxZeilenHeight(getZeilenNummer(name));
 }
 
-int ObjTabelle::getMaxZeilenHeight(Text* name) const
+int ObjTable::getMaxZeilenHeight(Text* name) const
 {
     return getMaxZeilenHeight(getZeilenNummer(name));
 }
 
-double ObjTabelle::getMausSpalte(
+double ObjTable::getMausSpalte(
     int mx) const // determines the column under the mouse
 {
     if (mx >= gr.x) return -1;
@@ -1399,21 +1399,21 @@ double ObjTabelle::getMausSpalte(
     return -1;
 }
 
-Text* ObjTabelle::getMausSpaltenName(int mx) const
+Text* ObjTable::getMausSpaltenName(int mx) const
 {
     double tmp = getMausSpalte(mx);
     if (tmp != (int)tmp) return 0;
     return getSpaltenName((int)tmp);
 }
 
-Text* ObjTabelle::zMausSpaltenName(int mx) const
+Text* ObjTable::zMausSpaltenName(int mx) const
 {
     double tmp = getMausSpalte(mx);
     if (tmp != (int)tmp) return 0;
     return zSpaltenName((int)tmp);
 }
 
-double ObjTabelle::getMausZeile(
+double ObjTable::getMausZeile(
     int my) const // calculates the row under the mouse
 {
     if (my >= gr.y) return -1;
@@ -1433,14 +1433,14 @@ double ObjTabelle::getMausZeile(
     return -1;
 }
 
-Text* ObjTabelle::getMausZeilenName(int my) const
+Text* ObjTable::getMausZeilenName(int my) const
 {
     double tmp = getMausZeile(my);
     if (tmp != (int)tmp) return 0;
     return getZeilenName((int)tmp);
 }
 
-Text* ObjTabelle::zMausZeilenName(int my) const
+Text* ObjTable::zMausZeilenName(int my) const
 {
     double tmp = getMausZeile(my);
     if (tmp != (int)tmp) return 0;
@@ -1448,119 +1448,119 @@ Text* ObjTabelle::zMausZeilenName(int my) const
 }
 
 const Punkt&
-ObjTabelle::getAuswahlPosition() const // returns the selection position
+ObjTable::getAuswahlPosition() const // returns the selection position
 {
     return selected;
 }
 
-int ObjTabelle::getRasterFarbe() const // returns the color of the grid
+int ObjTable::getRasterFarbe() const // returns the color of the grid
 {
     return rasterFarbe;
 }
 
-int ObjTabelle::getRasterBreite() const // returns the width of the grid
+int ObjTable::getRasterBreite() const // returns the width of the grid
 {
     return rasterBreite;
 }
 
-Border* ObjTabelle::getABorder() const // returns the selection border
+Border* ObjTable::getABorder() const // returns the selection border
 {
     return aRam ? dynamic_cast<Border*>(aRam->getThis()) : 0;
 }
 
-Border* ObjTabelle::zABorder() const
+Border* ObjTable::zABorder() const
 {
     return aRam;
 }
 
-AlphaFeld* ObjTabelle::getAAlphaFeld() const // returns the selection AlphaFeld
+AlphaField* ObjTable::getAAlphaField() const // returns the selection AlphaField
 {
-    return aAf ? dynamic_cast<AlphaFeld*>(aAf->getThis()) : 0;
+    return aAf ? dynamic_cast<AlphaField*>(aAf->getThis()) : 0;
 }
 
-AlphaFeld* ObjTabelle::zAAlphaFeld() const
+AlphaField* ObjTable::zAAlphaField() const
 {
     return aAf;
 }
 
-Border* ObjTabelle::getABorder(
+Border* ObjTable::getABorder(
     int sNum, int zNum) const // returns the selection border
 {
     RCArray<Border>* tmp = msaRam->z(sNum);
     return tmp ? tmp->get(zNum) : 0;
 }
 
-Border* ObjTabelle::zABorder(int sNum, int zNum) const
+Border* ObjTable::zABorder(int sNum, int zNum) const
 {
     RCArray<Border>* tmp = msaRam->z(sNum);
     return tmp ? tmp->z(zNum) : 0;
 }
 
-AlphaFeld* ObjTabelle::getAAlphaFeld(
-    int sNum, int zNum) const // returns the selection AlphaFeld
+AlphaField* ObjTable::getAAlphaField(
+    int sNum, int zNum) const // returns the selection AlphaField
 {
-    RCArray<AlphaFeld>* tmp = msaAf->z(sNum);
+    RCArray<AlphaField>* tmp = msaAf->z(sNum);
     return tmp ? tmp->get(zNum) : 0;
 }
 
-AlphaFeld* ObjTabelle::zAAlphaFeld(int sNum, int zNum) const
+AlphaField* ObjTable::zAAlphaField(int sNum, int zNum) const
 {
     return msaAf->z(sNum) ? msaAf->z(sNum)->z(zNum) : 0;
 }
 
-Border* ObjTabelle::getABorder(const char* spaltenName,
+Border* ObjTable::getABorder(const char* spaltenName,
     const char* zeilenName) const // returns the selection border
 {
     return getABorder(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Border* ObjTabelle::zABorder(
+Border* ObjTable::zABorder(
     const char* spaltenName, const char* zeilenName) const
 {
     return zABorder(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-AlphaFeld* ObjTabelle::getAAlphaFeld(const char* spaltenName,
-    const char* zeilenName) const // returns the selection AlphaFeld
+AlphaField* ObjTable::getAAlphaField(const char* spaltenName,
+    const char* zeilenName) const // returns the selection AlphaField
 {
-    return getAAlphaFeld(
+    return getAAlphaField(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-AlphaFeld* ObjTabelle::zAAlphaFeld(
+AlphaField* ObjTable::zAAlphaField(
     const char* spaltenName, const char* zeilenName) const
 {
-    return zAAlphaFeld(
+    return zAAlphaField(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Border* ObjTabelle::getABorder(
+Border* ObjTable::getABorder(
     Text* spaltenName, Text* zeilenName) const // returns the selection border
 {
     return getABorder(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Border* ObjTabelle::zABorder(Text* spaltenName, Text* zeilenName) const
+Border* ObjTable::zABorder(Text* spaltenName, Text* zeilenName) const
 {
     return zABorder(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-AlphaFeld* ObjTabelle::getAAlphaFeld(Text* spaltenName,
-    Text* zeilenName) const // returns the selection AlphaFeld
+AlphaField* ObjTable::getAAlphaField(Text* spaltenName,
+    Text* zeilenName) const // returns the selection AlphaField
 {
-    return getAAlphaFeld(
+    return getAAlphaField(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-AlphaFeld* ObjTabelle::zAAlphaFeld(Text* spaltenName, Text* zeilenName) const
+AlphaField* ObjTable::zAAlphaField(Text* spaltenName, Text* zeilenName) const
 {
-    return zAAlphaFeld(
+    return zAAlphaField(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-bool ObjTabelle::hatMsStyle(
+bool ObjTable::hatMsStyle(
     int sNum, int zNum, __int64 style) const // checks if style is present
 {
     __int64 s = styles->z(sNum) && styles->z(sNum)->hat(zNum)
@@ -1569,7 +1569,7 @@ bool ObjTabelle::hatMsStyle(
     return (s | style) == s;
 }
 
-bool ObjTabelle::hatMsStyleNicht(int sNum,
+bool ObjTable::hatMsStyleNicht(int sNum,
     int zNum,
     __int64 style) const // checks if style is not present
 {
@@ -1579,7 +1579,7 @@ bool ObjTabelle::hatMsStyleNicht(int sNum,
     return (s | style) != s;
 }
 
-bool ObjTabelle::hatMsStyle(const char* spaltenName,
+bool ObjTable::hatMsStyle(const char* spaltenName,
     const char* zeilenName,
     __int64 style) const // checks if style is present
 {
@@ -1587,7 +1587,7 @@ bool ObjTabelle::hatMsStyle(const char* spaltenName,
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-bool ObjTabelle::hatMsStyleNicht(const char* spaltenName,
+bool ObjTable::hatMsStyleNicht(const char* spaltenName,
     const char* zeilenName,
     __int64 style) const // checks if style is not present
 {
@@ -1595,7 +1595,7 @@ bool ObjTabelle::hatMsStyleNicht(const char* spaltenName,
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-bool ObjTabelle::hatMsStyle(Text* spaltenName,
+bool ObjTable::hatMsStyle(Text* spaltenName,
     Text* zeilenName,
     __int64 style) const // checks if style is present
 {
@@ -1603,7 +1603,7 @@ bool ObjTabelle::hatMsStyle(Text* spaltenName,
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-bool ObjTabelle::hatMsStyleNicht(Text* spaltenName,
+bool ObjTable::hatMsStyleNicht(Text* spaltenName,
     Text* zeilenName,
     __int64 style) const // checks if style is not present
 {
@@ -1611,15 +1611,15 @@ bool ObjTabelle::hatMsStyleNicht(Text* spaltenName,
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
 }
 
-Drawable* ObjTabelle::dublizieren() const // Creates a copy of the table
+Drawable* ObjTable::dublizieren() const // Creates a copy of the table
 {
-    ObjTabelle* obj = new ObjTabelle();
+    ObjTable* obj = new ObjTable();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStyle(style);
     if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
@@ -1628,11 +1628,11 @@ Drawable* ObjTabelle::dublizieren() const // Creates a copy of the table
         obj->setHintergrundImage(
             dynamic_cast<Image*>(hintergrundImage->getThis()));
     if (hintergrundFeld)
-        obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
+        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
     obj->setRasterFarbe(rasterFarbe);
     obj->setRasterBreite(rasterBreite);
     if (aRam) obj->setABorderZ((Border*)aRam->dublizieren());
-    if (aAf) obj->setAAlphaFeldZ((AlphaFeld*)aAf->dublizieren());
+    if (aAf) obj->setAAlphaFieldZ((AlphaField*)aAf->dublizieren());
     for (int s = 0; s < spaltenAnzahl; ++s)
     {
         obj->addSpalte(spaltenNamen->get(s));
@@ -1662,8 +1662,8 @@ Drawable* ObjTabelle::dublizieren() const // Creates a copy of the table
                 obj->setABorderZ(
                     s, z, (Border*)msaRam->z(s)->z(z)->dublizieren());
             if (msaAf->z(s) && msaAf->z(s)->z(z))
-                obj->setAAlphaFeldZ(
-                    s, z, (AlphaFeld*)msaAf->z(s)->z(z)->dublizieren());
+                obj->setAAlphaFieldZ(
+                    s, z, (AlphaField*)msaAf->z(s)->z(z)->dublizieren());
         }
     }
     obj->setAuswahl(selected.x, selected.y);

Table.h

@@ -7,14 +7,14 @@
 namespace Framework
 {
     class Border;     //! Border.h
-    class AlphaFeld;  //! AlphaField.h
+    class AlphaField;  //! AlphaField.h
     class VScrollBar; //! Scroll.h
     class HScrollBar; //! Scroll.h
     class Text;       //! Text.h
-    class ObjTabelle; //! from this file
+    class ObjTable; //! from this file
 
     //! Manages a table of drawings
-    class ObjTabelle : public DrawableBackground
+    class ObjTable : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -52,7 +52,7 @@ namespace Framework
             //! with the Erlaubt flag gets a different border
             static const __int64 SelectionBorder = 0x0080000;
             //! If this flag is set, the field that the user can select
-            //! with the Erlaubt flag gets a different AlphaFeld
+            //! with the Erlaubt flag gets a different AlphaField
             static const __int64 AuswahlBuffer = 0x00100000;
             //! If this flag is set, each field can have different
             //! borders and AlphaFelds when selected
@@ -101,19 +101,19 @@ namespace Framework
         int rasterFarbe;
         int rasterBreite;
         Border* aRam;
-        AlphaFeld* aAf;
+        AlphaField* aAf;
         RCArray<RCArray<Border>>* msaRam;
-        RCArray<RCArray<AlphaFeld>>* msaAf;
+        RCArray<RCArray<AlphaField>>* msaAf;
         RCArray<Array<__int64>>* styles;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
-        DLLEXPORT ObjTabelle();
+        DLLEXPORT ObjTable();
         //! Destructor
-        DLLEXPORT virtual ~ObjTabelle();
+        DLLEXPORT virtual ~ObjTable();
         //! Adds a column to the table
         //! \param name The name of the column
         DLLEXPORT void addSpalte(const char* name);
@@ -304,13 +304,13 @@ namespace Framework
         //! Sets the width of the border drawn around the selected cell
         //! \param br The width in pixels
         DLLEXPORT void setARBreite(int br);
-        //! Sets a pointer to the AlphaFeld used for the selected cell
-        //! \param af The AlphaFeld
-        DLLEXPORT void setAAlphaFeldZ(AlphaFeld* af);
-        //! Sets the color of the AlphaFeld used for the selected cell
+        //! Sets a pointer to the AlphaField used for the selected cell
+        //! \param af The AlphaField
+        DLLEXPORT void setAAlphaFieldZ(AlphaField* af);
+        //! Sets the color of the AlphaField used for the selected cell
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setAAfFarbe(int f);
-        //! Sets the strength of the AlphaFeld used for the selected cell
+        //! Sets the strength of the AlphaField used for the selected cell
         //! \param st The strength
         DLLEXPORT void setAAfStrength(int st);
         //! Sets a pointer to a border used with the AuswahlMultistyled flag
@@ -363,19 +363,19 @@ namespace Framework
         //! Sets the color gradient used with the AuswahlMultistyled flag
         //! when selecting a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param af The color gradient
-        DLLEXPORT void setAAlphaFeldZ(int sNum, int zNum, AlphaFeld* af);
+        DLLEXPORT void setAAlphaFieldZ(int sNum, int zNum, AlphaField* af);
         //! Sets the color gradient used with the AuswahlMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row \param af The color
         //! gradient
-        DLLEXPORT void setAAlphaFeldZ(
-            const char* spaltenName, const char* zeilenName, AlphaFeld* af);
+        DLLEXPORT void setAAlphaFieldZ(
+            const char* spaltenName, const char* zeilenName, AlphaField* af);
         //! Sets the color gradient used with the AuswahlMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row \param af The color
         //! gradient
-        DLLEXPORT void setAAlphaFeldZ(
-            Text* spaltenName, Text* zeilenName, AlphaFeld* af);
+        DLLEXPORT void setAAlphaFieldZ(
+            Text* spaltenName, Text* zeilenName, AlphaField* af);
         //! Sets the color of the color gradient used with the
         //! AuswahlMultistyled flag when selecting a specific cell
         //! \param sNum The index of the column \param zNum The index of the
@@ -489,7 +489,7 @@ namespace Framework
         DLLEXPORT bool tick(double tickVal) override;
         //! Processes keyboard messages
         //! \param me The event triggered by the keyboard input
-        DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
+        DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
@@ -643,10 +643,10 @@ namespace Framework
         //! used for the selected field
         DLLEXPORT Border* zABorder() const;
         //! Returns a pointer to the color gradient used for the selected field
-        DLLEXPORT AlphaFeld* getAAlphaFeld() const;
+        DLLEXPORT AlphaField* getAAlphaField() const;
         //! Returns a pointer to the color gradient without increased reference
         //! counter used for the selected field
-        DLLEXPORT AlphaFeld* zAAlphaFeld() const;
+        DLLEXPORT AlphaField* zAAlphaField() const;
         //! Returns a pointer to the border used with the AuswahlMultistyled
         //! flag when selecting a specific cell \param sNum The index of the
         //! column \param zNum The index of the row
@@ -658,12 +658,12 @@ namespace Framework
         //! Returns a pointer to the color gradient used with the
         //! AuswahlMultistyled flag when selecting a specific cell
         //! \param sNum The index of the column \param zNum The index of the row
-        DLLEXPORT AlphaFeld* getAAlphaFeld(int sNum, int zNum) const;
+        DLLEXPORT AlphaField* getAAlphaField(int sNum, int zNum) const;
         //! Returns a pointer to the color gradient without increased reference
         //! counter used with the AuswahlMultistyled flag when selecting a
         //! specific cell \param sNum The index of the column
         //! \param zNum The index of the row
-        DLLEXPORT AlphaFeld* zAAlphaFeld(int sNum, int zNum) const;
+        DLLEXPORT AlphaField* zAAlphaField(int sNum, int zNum) const;
         //! Returns a pointer to the border used with the AuswahlMultistyled
         //! flag when selecting a specific cell \param spaltenName The name of
         //! the column \param zeilenName The name of the row
@@ -679,13 +679,13 @@ namespace Framework
         //! AuswahlMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
-        DLLEXPORT AlphaFeld* getAAlphaFeld(
+        DLLEXPORT AlphaField* getAAlphaField(
             const char* spaltenName, const char* zeilenName) const;
         //! Returns a pointer to the color gradient without increased reference
         //! counter used with the AuswahlMultistyled flag when selecting a
         //! specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row
-        DLLEXPORT AlphaFeld* zAAlphaFeld(
+        DLLEXPORT AlphaField* zAAlphaField(
             const char* spaltenName, const char* zeilenName) const;
         //! Returns a pointer to the border used with the AuswahlMultistyled
         //! flag when selecting a specific cell \param spaltenName The name of
@@ -700,13 +700,13 @@ namespace Framework
         //! AuswahlMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
-        DLLEXPORT AlphaFeld* getAAlphaFeld(
+        DLLEXPORT AlphaField* getAAlphaField(
             Text* spaltenName, Text* zeilenName) const;
         //! Returns a pointer to the color gradient without increased reference
         //! counter used with the AuswahlMultistyled flag when selecting a
         //! specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row
-        DLLEXPORT AlphaFeld* zAAlphaFeld(
+        DLLEXPORT AlphaField* zAAlphaField(
             Text* spaltenName, Text* zeilenName) const;
         //! Checks whether a specific style is set for a specific cell with the
         //! AuswahlMultistyled flag \param sNum The index of the column

Text.cpp

@@ -448,11 +448,11 @@ void Framework::Text::regexReplace(const char* regex,
         = config == 0 ? Regex::parse(regex) : Regex::parse(regex, *config);
     if (!matcher) return;
     auto result = matcher->match(txt, length);
-    if (result->getEintragAnzahl() > 0)
+    if (result->getEntryCount() > 0)
     {
         int replacedLength = 0;
         int replacementLength = 0;
-        Text* replacements = new Text[result->getEintragAnzahl()];
+        Text* replacements = new Text[result->getEntryCount()];
         int i = 0;
 #ifdef WIN32
 #    pragma warning(push)

Text.h

@@ -204,23 +204,23 @@ namespace Framework
         //! \param p1 The start position of the text section to be replaced
         //! \param p2 The end position of the text section to be replaced
         //! \param t The string to be copied to the corresponding position
-        //! Example: ( "Hallo Welt" ).ersetzen( 2, 5, "lt" );
-        //! results in: "Halt Welt"
+        //! Example: ( "Hallo World" ).ersetzen( 2, 5, "lt" );
+        //! results in: "Halt World"
         DLLEXPORT void ersetzen(int p1, int p2, const char* t);
         //! Replaces a specific text section with another string
         //! \param p1 The start position of the text section to be replaced
         //! \param p2 The end position of the text section to be replaced
         //! \param t The string to be copied to the corresponding position
         //! \param len The length of the text to be copied to the corresponding
-        //! position Example: ( "Hallo Welt" ).ersetzen( 2, 5, "lt", 2 );
-        //! results in: "Halt Welt"
+        //! position Example: ( "Hallo World" ).ersetzen( 2, 5, "lt", 2 );
+        //! results in: "Halt World"
         DLLEXPORT void ersetzen(int p1, int p2, const char* t, int len);
         //! Replaces a specific text section with the content of another Text
         //!  p1: The start position of the text section to be replaced
         //!  p2: The end position of the text section to be replaced
         //! \param t The Text whose content should be copied to the
-        //! corresponding position Example: ( "Hallo Welt" ).ersetzen( 2, 5, new
-        //! Text( "lt" ) ); results in: "Halt Welt"
+        //! corresponding position Example: ( "Hallo World" ).ersetzen( 2, 5, new
+        //! Text( "lt" ) ); results in: "Halt World"
         DLLEXPORT void ersetzen(int p1, int p2, const Text& t);
         //! Searches and replaces every occurrence of a specific character with
         //! another

TextField.cpp

@@ -62,7 +62,7 @@ void TextField::TextStyleManager::setTextStyle(
     int begin, int end, TextStyle style)
 {
     if (begin < 0 || begin > end || begin > text->getLength()) return;
-    int sc = textStyle.getEintragAnzahl();
+    int sc = textStyle.getEntryCount();
     int index = -1;
     TextStyle s = textStyle.get(0);
     // search to the correct position in the style array
@@ -114,7 +114,7 @@ void TextField::TextStyleManager::setTextStyle(
 //  end: the index of the first character after the section
 void TextField::TextStyleManager::removeText(int begin, int end)
 {
-    int sc = textStyle.getEintragAnzahl();
+    int sc = textStyle.getEntryCount();
     for (int i = 1; i < sc; i++)
     {
         TextStyle s = textStyle.get(i);
@@ -141,7 +141,7 @@ void TextField::TextStyleManager::insertText(int pos, const char* text)
 {
     int len = textLength(text);
     this->text->insert(pos, text);
-    int sc = textStyle.getEintragAnzahl();
+    int sc = textStyle.getEntryCount();
     for (int i = 0; i < sc; i++)
     {
         TextStyle s = textStyle.get(i);
@@ -157,7 +157,7 @@ void TextField::TextStyleManager::insertText(int pos, const char* text)
 // Removes unnecessary duplicate styles
 void TextField::TextStyleManager::cleanupStyles()
 {
-    int sc = textStyle.getEintragAnzahl();
+    int sc = textStyle.getEntryCount();
     TextStyle last = textStyle.get(0);
     for (int i = 1; i < sc; i++)
     {
@@ -190,7 +190,7 @@ TextStyle& TextField::TextStyleManager::currentStyle()
 // returns the current text renderer
 TextRenderer* TextField::TextStyleManager::zCurrentRenderer()
 {
-    if (renderer->getEintragAnzahl() == 0) return 0;
+    if (renderer->getEntryCount() == 0) return 0;
     TextRenderer* tr = renderer->z(current.rendererIndex);
     if (!tr) tr = renderer->z(0);
     if (tr) tr->setSchriftSize(current.fontSize);
@@ -201,7 +201,7 @@ TextRenderer* TextField::TextStyleManager::zCurrentRenderer()
 bool TextField::TextStyleManager::nextStyle()
 {
     index++;
-    if (textStyle.getEintragAnzahl() > styleIndex + 1
+    if (textStyle.getEntryCount() > styleIndex + 1
         && index >= textStyle.get(styleIndex + 1).beginIndex)
         current = textStyle.get(styleIndex++ + 1);
     return text && index < text->getLength();
@@ -258,8 +258,8 @@ TextField::TextField()
     charEvent = 0;
     horizontalScrollBar = new HScrollBar();
     vertikalScrollBar = new VScrollBar();
-    this->setMausEreignis(_ret1ME);
-    this->setTastaturEreignis(_ret1TE);
+    this->setMouseEvent(_ret1ME);
+    this->setKeyboardEvent(_ret1TE);
 }
 
 // Destructor
@@ -269,7 +269,7 @@ TextField::~TextField()
     if (autoLineBreakSpacing) autoLineBreakSpacing->release();
 }
 
-void TextField::doMausEreignis(MausEreignis& me, bool userRet) // Mouse event
+void TextField::doMouseEvent(MouseEvent& me, bool userRet) // Mouse event
 {
     if (!userRet) return;
     if (hatStyleNicht(Style::Editierbar))
@@ -507,7 +507,7 @@ int TextField::getTextWidth() const
 // specific character and the interactParam in the style != 0
 //  call: charEvent( charIndex, interactParam, mausEreignis );
 void TextField::setCharEvent(
-    std::function<void(int, int, MausEreignis me)> charEvent)
+    std::function<void(int, int, MouseEvent me)> charEvent)
 {
     this->charEvent = charEvent;
 }
@@ -814,11 +814,11 @@ void TextField::addZeile(const char* zeile) // appends a line
         Text* txt = new Text(zeile);
         if (zeile[txt->getLength() - 1] != '\n') txt->append("\n");
         TextRenderer* r = tm->renderer->z(0);
-        if (tm->textStyle.get(tm->textStyle.getEintragAnzahl() - 1)
+        if (tm->textStyle.get(tm->textStyle.getEntryCount() - 1)
                 .rendererIndex
-            < tm->renderer->getEintragAnzahl())
+            < tm->renderer->getEntryCount())
             r = tm->renderer->z(
-                tm->textStyle.get(tm->textStyle.getEintragAnzahl() - 1)
+                tm->textStyle.get(tm->textStyle.getEntryCount() - 1)
                     .rendererIndex);
         if (r)
         {
@@ -826,7 +826,7 @@ void TextField::addZeile(const char* zeile) // appends a line
             int rbr = (rahmen && hatStyle(Style::Border)) ? rahmen->getRBreite()
                                                           : 0;
             r->setSchriftSize(
-                tm->textStyle.get(tm->textStyle.getEintragAnzahl() - 1)
+                tm->textStyle.get(tm->textStyle.getEntryCount() - 1)
                     .fontSize);
             r->textFormatieren(txt, gr.x - ((int)vs * 15) - rbr * 2);
         }
@@ -850,11 +850,11 @@ void TextField::addZeile(const char* zeile, int color)
         Text* txt = new Text(zeile);
         if (zeile[txt->getLength() - 1] != '\n') txt->append("\n");
         TextRenderer* r = tm->renderer->z(0);
-        if (tm->textStyle.get(tm->textStyle.getEintragAnzahl() - 1)
+        if (tm->textStyle.get(tm->textStyle.getEntryCount() - 1)
                 .rendererIndex
-            < tm->renderer->getEintragAnzahl())
+            < tm->renderer->getEntryCount())
             r = tm->renderer->z(
-                tm->textStyle.get(tm->textStyle.getEintragAnzahl() - 1)
+                tm->textStyle.get(tm->textStyle.getEntryCount() - 1)
                     .rendererIndex);
         if (r)
         {
@@ -862,7 +862,7 @@ void TextField::addZeile(const char* zeile, int color)
             int rbr = (rahmen && hatStyle(Style::Border)) ? rahmen->getRBreite()
                                                           : 0;
             r->setSchriftSize(
-                tm->textStyle.get(tm->textStyle.getEintragAnzahl() - 1)
+                tm->textStyle.get(tm->textStyle.getEntryCount() - 1)
                     .fontSize);
             r->textFormatieren(txt, gr.x - ((int)vs * 15) - rbr * 2);
         }
@@ -882,7 +882,7 @@ void TextField::addZeile(const char* zeile, int color)
 // Deselects all text sections
 void TextField::deselectAuswahl()
 {
-    for (int i = 0; i < tm->textStyle.getEintragAnzahl(); i++)
+    for (int i = 0; i < tm->textStyle.getEntryCount(); i++)
     {
         TextStyle s = tm->textStyle.get(i);
         if (s.selected)
@@ -945,7 +945,7 @@ void TextField::invertAuswahl(int begin, int end)
 void TextField::replaceAuswahl(const char* text)
 {
     tm->cleanupStyles();
-    int sa = tm->textStyle.getEintragAnzahl();
+    int sa = tm->textStyle.getEntryCount();
     int last = tm->text->getLength();
     int si = 0;
     for (int i = sa - 1; i >= 0; i--)
@@ -996,7 +996,7 @@ void TextField::setTextRendererZ(RCArray<TextRenderer>* textRd)
 void TextField::setFontZ(Font* schrift) // sets a pointer to the font
 {
     if (!tm->renderer) tm->renderer = new RCArray<TextRenderer>();
-    if (!tm->renderer->getEintragAnzahl())
+    if (!tm->renderer->getEntryCount())
         tm->renderer->add(new TextRenderer(schrift));
     else
         tm->renderer->z(0)->setFontZ(schrift);
@@ -1009,7 +1009,7 @@ void TextField::setFontZ(Font* schrift) // sets a pointer to the font
 void TextField::setFontZ(int rendererIndex, Font* schrift)
 {
     if (!tm->renderer) tm->renderer = new RCArray<TextRenderer>();
-    if (tm->renderer->getEintragAnzahl() <= rendererIndex)
+    if (tm->renderer->getEntryCount() <= rendererIndex)
         tm->renderer->add(new TextRenderer(schrift), rendererIndex);
     else
         tm->renderer->z(rendererIndex)->setFontZ(schrift);
@@ -1063,7 +1063,7 @@ void TextField::setSchowChar(unsigned char c) // for password field *
 
 void TextField::setVScrollZuZeile(int zeile) // scrolls to line
 {
-    if (vertikalScrollBar && tm->renderer && tm->renderer->getEintragAnzahl()
+    if (vertikalScrollBar && tm->renderer && tm->renderer->getEntryCount()
         && tm->text && hatStyle(Style::Mehrzeilig))
     {
         lockDrawable();
@@ -1261,7 +1261,7 @@ bool TextField::tick(double tickval) // tick
     return DrawableBackground::tick(tickval);
 }
 
-void TextField::doTastaturEreignis(TastaturEreignis& te)
+void TextField::doKeyboardEvent(KeyboardEvent& te)
 {
     bool ntakc = !te.verarbeitet;
     if (te.verarbeitet || hatStyleNicht(Style::Fokus)) return;
@@ -1398,7 +1398,7 @@ void TextField::doTastaturEreignis(TastaturEreignis& te)
                 {
                     if (te.virtualKey == 'c' || te.virtualKey == 'C')
                     {
-                        int sa = tm->textStyle.getEintragAnzahl();
+                        int sa = tm->textStyle.getEntryCount();
                         int length = 0;
                         for (int i = 0; i < sa; i++)
                         {
@@ -1831,10 +1831,10 @@ Drawable* TextField::dublizieren() const // Creates a copy of the drawing
     TextField* obj = new TextField();
     obj->setPosition(pos);
     obj->setSize(gr);
-    obj->setMausEreignisParameter(makParam);
-    obj->setTastaturEreignisParameter(takParam);
-    obj->setMausEreignis(mak);
-    obj->setTastaturEreignis(tak);
+    obj->setMouseEventParameter(makParam);
+    obj->setKeyboardEventParameter(takParam);
+    obj->setMouseEvent(mak);
+    obj->setKeyboardEvent(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStyle(style);
     obj->tm->renderer->release();
@@ -1849,7 +1849,7 @@ Drawable* TextField::dublizieren() const // Creates a copy of the drawing
     if (tm->text) obj->setText(tm->text->getText());
     obj->setHintergrundFarbe(hintergrundFarbe);
     if (hintergrundFeld)
-        obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
+        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
     if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
     if (hintergrundImage)
         obj->setHintergrundImage(

TextField.h

@@ -7,7 +7,7 @@ namespace Framework
 {
     class Font;    //! Font.h
     class Text;       //! Text.h
-    class AlphaFeld;  //! AlphaField.h
+    class AlphaField;  //! AlphaField.h
     class Border;     //! Border.h
     class TextField;   //! from this file
     class VScrollBar; //! Scroll.h
@@ -123,14 +123,14 @@ namespace Framework
         int cpos;
         double tickVal;
         bool mausKlick;
-        std::function<void(int, int, MausEreignis me)> charEvent;
+        std::function<void(int, int, MouseEvent me)> charEvent;
 
         int getTextHeight() const;
         int getTextWidth() const;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT virtual void doMausEreignis(
-            MausEreignis& me, bool userRet) override;
+        DLLEXPORT virtual void doMouseEvent(
+            MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
@@ -141,7 +141,7 @@ namespace Framework
         //! character and the interactParam in the style is != 0
         //! \param charEvent charEvent( charIndex, interactParam, mausEreignis );
         DLLEXPORT void setCharEvent(
-            std::function<void(int, int, MausEreignis me)> charEvent);
+            std::function<void(int, int, MouseEvent me)> charEvent);
         //! Sets a pointer to the text in the text field
         //! \param txt The pointer to the text
         DLLEXPORT void setTextZ(Text* txt);
@@ -286,7 +286,7 @@ namespace Framework
         DLLEXPORT virtual bool tick(double tickval) override;
         //! Processes keyboard messages
         //! \param me The event triggered by the keyboard input
-        DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
+        DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
         DLLEXPORT virtual void render(Image& zRObj) override;

Texture.cpp

@@ -10,9 +10,9 @@
 
 using namespace Framework;
 
-// Contents of the Textur class
+// Contents of the Texture class
 // Constructor
-Textur::Textur()
+Texture::Texture()
     : ReferenceCounter()
 {
     bild = 0;
@@ -22,14 +22,14 @@ Textur::Textur()
 }
 
 // Destructor
-Textur::~Textur()
+Texture::~Texture()
 {
     if (bild) bild->release();
 }
 
 // Sets a pointer to the image that contains the texture
 //  b: The pointer to the image
-void Textur::setImageZ(Image* b)
+void Texture::setImageZ(Image* b)
 {
     if (bild != b) changed = 1;
     if (bild) bild->release();
@@ -38,7 +38,7 @@ void Textur::setImageZ(Image* b)
 
 // Sets the image that contains the texture by copying it
 //  b: The image to be copied
-void Textur::setImage(Image* b)
+void Texture::setImage(Image* b)
 {
     if (!b) return;
     if (bild != b) changed = 1;
@@ -53,39 +53,39 @@ void Textur::setImage(Image* b)
 }
 
 // Returns a pointer to the image
-Image* Textur::getImage() const
+Image* Texture::getImage() const
 {
     return bild ? dynamic_cast<Image*>(bild->getThis()) : 0;
 }
 
 // Returns a pointer to the image without increased reference counter
-Image* Textur::zImage() const
+Image* Texture::zImage() const
 {
     return bild;
 }
 
-// Returns the id of the texture if it was registered in a TexturList.
-// (see Framework::zTexturRegister())
-int Textur::getId() const
+// Returns the id of the texture if it was registered in a TextureList.
+// (see Framework::zTextureRegister())
+int Texture::getId() const
 {
     return id;
 }
 
 // Updates the texture. The pixels of the current image are copied into
 // the graphics memory
-bool DX9Textur::updateTextur()
+bool DX9Texture::updateTextur()
 {
     return 1;
 }
 
 // Returns true if updateTextur needs to be called
-bool DX9Textur::brauchtUpdate() const
+bool DX9Texture::brauchtUpdate() const
 {
     return 0;
 }
 
-DX11Textur::DX11Textur(ID3D11Device* device, ID3D11DeviceContext* context)
-    : Textur(),
+DX11Texture::DX11Texture(ID3D11Device* device, ID3D11DeviceContext* context)
+    : Texture(),
       txt(0),
       view(0),
       device(device),
@@ -94,7 +94,7 @@ DX11Textur::DX11Textur(ID3D11Device* device, ID3D11DeviceContext* context)
       useMips(1)
 {}
 
-DX11Textur::~DX11Textur()
+DX11Texture::~DX11Texture()
 {
 #ifdef WIN32
     if (txt) txt->Release();
@@ -104,7 +104,7 @@ DX11Textur::~DX11Textur()
 
 // Updates the texture. The pixels of the current image are copied into
 // the graphics memory
-bool DX11Textur::updateTextur()
+bool DX11Texture::updateTextur()
 {
     if (!bild) return 0;
 #ifdef WIN32
@@ -177,38 +177,38 @@ bool DX11Textur::updateTextur()
 }
 
 // Returns true if updateTextur needs to be called
-bool DX11Textur::brauchtUpdate() const
+bool DX11Texture::brauchtUpdate() const
 {
     return !view;
 }
 
 // Returns the used shader resource view
-DX11Textur::operator ID3D11ShaderResourceView*() const
+DX11Texture::operator ID3D11ShaderResourceView*() const
 {
     return view;
 }
 
 //! Returns the used texture
-DX11Textur::operator ID3D11Texture2D*() const
+DX11Texture::operator ID3D11Texture2D*() const
 {
     return txt;
 }
 
 //! specifies that this texture is used as a render target
-void DX11Textur::setRenderTarget(bool rt)
+void DX11Texture::setRenderTarget(bool rt)
 {
     if (rt) useMips = 0;
     renderTarget = rt;
 }
 
 //! specifies if a mip map should be generated
-void DX11Textur::setUseMips(bool useMips)
+void DX11Texture::setUseMips(bool useMips)
 {
     this->useMips = useMips;
 }
 
 //! copy the texture to an image
-void DX11Textur::copyToImage(Image* zB)
+void DX11Texture::copyToImage(Image* zB)
 {
 #ifdef WIN32
     D3D11_TEXTURE2D_DESC tempBufferDesc;

Texture.h

@@ -12,13 +12,13 @@ namespace Framework
 {
     class Image;       //! Image.h
     class Render3D;   //! Render3D.h
-    class TexturList; //! TextureList.h
+    class TextureList; //! TextureList.h
     class DX12CopyCommandQueue;
     class DX12DirectCommandQueue;
 
     //! Converts an image to a texture that can be passed to the graphics
     //! card for rendering
-    class Textur : public virtual ReferenceCounter
+    class Texture : public virtual ReferenceCounter
     {
     protected:
         Image* bild;
@@ -28,9 +28,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT Textur();
+        DLLEXPORT Texture();
         //! Destructor
-        DLLEXPORT virtual ~Textur();
+        DLLEXPORT virtual ~Texture();
         //! Sets a pointer to the image that contains the texture
         //! \param b The pointer to the image
         DLLEXPORT void setImageZ(Image* b);
@@ -46,16 +46,16 @@ namespace Framework
         DLLEXPORT Image* getImage() const;
         //! Returns a pointer to the image without increased reference counter
         DLLEXPORT Image* zImage() const;
-        //! Returns the id of the texture if it was registered in a TexturList.
-        //! (see Framework::zTexturRegister())
+        //! Returns the id of the texture if it was registered in a TextureList.
+        //! (see Framework::zTextureRegister())
         DLLEXPORT int getId() const;
 
-        friend TexturList;
+        friend TextureList;
     };
 
     //! Converts an image to a texture that can be passed to the graphics
     //! card for rendering
-    class DX9Textur : public Textur
+    class DX9Texture : public Texture
     {
     public:
         //! Updates the texture. The pixels of the current image are copied
@@ -65,7 +65,7 @@ namespace Framework
         DLLEXPORT virtual bool brauchtUpdate() const override;
     };
 
-    class DX11Textur : public Textur
+    class DX11Texture : public Texture
     {
     private:
         ID3D11Texture2D* txt;
@@ -76,9 +76,9 @@ namespace Framework
         bool useMips;
 
     public:
-        DLLEXPORT DX11Textur(
+        DLLEXPORT DX11Texture(
             ID3D11Device* device, ID3D11DeviceContext* context);
-        DLLEXPORT ~DX11Textur();
+        DLLEXPORT ~DX11Texture();
         //! Updates the texture. The pixels of the current image are copied
         //! to graphics memory
         DLLEXPORT bool updateTextur() override;

Texture2D.cpp

@@ -5,10 +5,10 @@
 
 using namespace Framework;
 
-// Contents of the Textur2D class from Texture2D.h
+// Contents of the Texture2D class from Texture2D.h
 
 // Konstructor
-Textur2D::Textur2D()
+Texture2D::Texture2D()
     : ReferenceCounter()
 {
     circularAnimation = 0;
@@ -18,7 +18,7 @@ Textur2D::Textur2D()
 }
 
 // Destructor
-Textur2D::~Textur2D()
+Texture2D::~Texture2D()
 {
     if (txt) txt->release();
     for (auto i : *animData)
@@ -31,14 +31,14 @@ Textur2D::~Textur2D()
 
 // specifies whether the animation should repeat automatically
 //  ca: 1 if the animation should repeat automatically
-void Textur2D::setCircularAnimation(bool ca)
+void Texture2D::setCircularAnimation(bool ca)
 {
     circularAnimation = ca;
 }
 
 // sets a pointer to the texture (if not animated)
 //  textur: The pointer to the image
-void Textur2D::setTexturZ(Image* textur)
+void Texture2D::setTextureZ(Image* textur)
 {
     if (txt) txt->release();
     txt = textur;
@@ -46,14 +46,14 @@ void Textur2D::setTexturZ(Image* textur)
 
 // adds an animation
 //  textur: The pointer to the animation data
-void Textur2D::addAnimationZ(Animation2DData* textur)
+void Texture2D::addAnimationZ(Animation2DData* textur)
 {
     animData->add(new Animation{textur, 0, 0});
 }
 
 // sets the current animation
 //  index: The index of the animation
-void Textur2D::setAnimation(int index)
+void Texture2D::setAnimation(int index)
 {
     if (animationIndex == index) return;
     if (animationIndex != -1)
@@ -62,7 +62,7 @@ void Textur2D::setAnimation(int index)
         animData->get(animationIndex)->ausgleich = 0;
     }
     animationIndex = index;
-    int anz = animData->getEintragAnzahl();
+    int anz = animData->getEntryCount();
     if (animationIndex >= anz && (!circularAnimation || anz == 0))
         animationIndex = -1;
     else if (animationIndex >= anz)
@@ -70,7 +70,7 @@ void Textur2D::setAnimation(int index)
 }
 
 // activates the next animation
-void Textur2D::nextAnimation()
+void Texture2D::nextAnimation()
 {
     if (animationIndex != -1)
     {
@@ -78,7 +78,7 @@ void Textur2D::nextAnimation()
         animData->get(animationIndex)->ausgleich = 0;
     }
     animationIndex++;
-    int anz = animData->getEintragAnzahl();
+    int anz = animData->getEntryCount();
     if (animationIndex >= anz && (!circularAnimation || anz == 0))
         animationIndex = -1;
     else if (animationIndex >= anz)
@@ -87,7 +87,7 @@ void Textur2D::nextAnimation()
 
 // sets the elapsed time since the last call
 //  t: the elapsed time in seconds
-bool Textur2D::tick(double t)
+bool Texture2D::tick(double t)
 {
     if (animationIndex != -1)
     {
@@ -112,7 +112,7 @@ bool Textur2D::tick(double t)
 }
 
 // returns the current texture
-Image* Textur2D::zTextur() const
+Image* Texture2D::zTexture() const
 {
     if (animationIndex != -1)
         return animData->get(animationIndex)

Texture2D.h

@@ -7,7 +7,7 @@ namespace Framework
     class Image;
     class Animation2DData;
 
-    class Textur2D : public virtual ReferenceCounter
+    class Texture2D : public virtual ReferenceCounter
     {
     private:
         struct Animation
@@ -24,15 +24,15 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT Textur2D();
+        DLLEXPORT Texture2D();
         //! Destructor
-        DLLEXPORT ~Textur2D();
+        DLLEXPORT ~Texture2D();
         //! Sets whether the animation should repeat automatically
         //! \param ca 1 if the animation should repeat automatically
         DLLEXPORT void setCircularAnimation(bool ca);
         //! Sets a pointer to the texture (if not animated)
         //! \param textur The pointer to the image
-        DLLEXPORT void setTexturZ(Image* textur);
+        DLLEXPORT void setTextureZ(Image* textur);
         //! Adds an animation
         //! \param textur The pointer to the animation data
         DLLEXPORT void addAnimationZ(Animation2DData* textur);
@@ -45,6 +45,6 @@ namespace Framework
         //! \param t The elapsed time in seconds
         DLLEXPORT bool tick(double t);
         //! Returns the current texture
-        DLLEXPORT Image* zTextur() const;
+        DLLEXPORT Image* zTexture() const;
     };
 } // namespace Framework

TextureList.cpp

@@ -5,27 +5,27 @@
 
 using namespace Framework;
 
-int TexturList::id = 0;
-Critical TexturList::cs;
+int TextureList::id = 0;
+Critical TextureList::cs;
 
-// Contents of the TexturList class
+// Contents of the TextureList class
 // Constructor
-TexturList::TexturList()
+TextureList::TextureList()
     : ReferenceCounter()
 {
-    textures = new RCArray<Textur>();
+    textures = new RCArray<Texture>();
     names = new RCArray<Text>();
 }
 
 // Destructor
-TexturList::~TexturList()
+TextureList::~TextureList()
 {
     textures->release();
     names->release();
 }
 
 // Deletes all textures
-__declspec(dllexport) void TexturList::leeren()
+__declspec(dllexport) void TextureList::leeren()
 {
     cs.lock();
     textures->leeren();
@@ -36,7 +36,7 @@ __declspec(dllexport) void TexturList::leeren()
 // Adds a texture to the list
 //  t: The texture
 //  name: The name under which the texture is stored in the list
-bool TexturList::addTextur(Textur* t, const char* name)
+bool TextureList::addTexture(Texture* t, const char* name)
 {
     cs.lock();
     for (auto i : *names)
@@ -57,7 +57,7 @@ bool TexturList::addTextur(Textur* t, const char* name)
 
 // Removes a texture from the list
 //  name: The name of the texture
-void TexturList::removeTextur(const char* name)
+void TextureList::removeTexture(const char* name)
 {
     cs.lock();
     int index = 0;
@@ -78,7 +78,7 @@ void TexturList::removeTextur(const char* name)
 // Checks whether a texture has been stored under a specific name
 //  name: The name
 //  return: true if a texture with the name exists
-bool TexturList::hatTextur(const char* name) const
+bool TextureList::hasTexture(const char* name) const
 {
     cs.lock();
     for (auto i : *names)
@@ -95,7 +95,7 @@ bool TexturList::hatTextur(const char* name) const
 
 // Returns a specific texture
 //  name: The name of the texture
-Textur* TexturList::getTextur(const char* name) const
+Texture* TextureList::getTexture(const char* name) const
 {
     cs.lock();
     int index = 0;
@@ -114,7 +114,7 @@ Textur* TexturList::getTextur(const char* name) const
 
 // Returns a specific texture
 //  id: The id of the texture
-Textur* TexturList::getTextur(int id) const
+Texture* TextureList::getTexture(int id) const
 {
     cs.lock();
     for (auto i : *textures)
@@ -122,7 +122,7 @@ Textur* TexturList::getTextur(int id) const
         if (i->getId() == id)
         {
             cs.unlock();
-            return dynamic_cast<Textur*>(i->getThis());
+            return dynamic_cast<Texture*>(i->getThis());
         }
     }
     cs.unlock();
@@ -131,7 +131,7 @@ Textur* TexturList::getTextur(int id) const
 
 // Returns a specific texture without increased reference counter
 //  name: The name of the texture
-Textur* TexturList::zTextur(const char* name) const
+Texture* TextureList::zTexture(const char* name) const
 {
     cs.lock();
     int index = 0;
@@ -150,7 +150,7 @@ Textur* TexturList::zTextur(const char* name) const
 
 // Returns a specific texture without increased reference counter
 //  id: The id of the texture
-Textur* TexturList::zTextur(int id) const
+Texture* TextureList::zTexture(int id) const
 {
     cs.lock();
     for (auto i : *textures)
@@ -168,10 +168,10 @@ Textur* TexturList::zTextur(int id) const
 // static functions
 
 // Initializes static private members. Called automatically by the framework.
-void TexturList::init()
+void TextureList::init()
 {
     id = 0;
 }
 
 // Deletes static private members. Called automatically by the framework.
-void TexturList::destroy() {}
+void TextureList::destroy() {}

TextureList.h

@@ -5,47 +5,47 @@
 
 namespace Framework
 {
-    class Textur; //! Texture.h
+    class Texture; //! Texture.h
 
     //! Manages all loaded texture data so that multiple drawings can use
     //! the same data
-    class TexturList : public virtual ReferenceCounter
+    class TextureList : public virtual ReferenceCounter
     {
     private:
         static int id;
         static Critical cs;
-        RCArray<Textur>* textures;
+        RCArray<Texture>* textures;
         RCArray<Text>* names;
 
     public:
         //! Constructor
-        TexturList();
+        TextureList();
         //! Destructor
-        ~TexturList();
+        ~TextureList();
         //! Deletes all textures
         DLLEXPORT void leeren();
         //! Adds a texture to the list
         //! \param t The texture
         //! \param name The name under which the texture is stored in the list
-        DLLEXPORT bool addTextur(Textur* t, const char* name);
+        DLLEXPORT bool addTexture(Texture* t, const char* name);
         //! Removes a texture from the list
         //! \param name The name of the texture
-        DLLEXPORT void removeTextur(const char* name);
+        DLLEXPORT void removeTexture(const char* name);
         //! Checks whether a texture is stored under a specific name
         //! \param name The name \return true if a texture with the name exists
-        DLLEXPORT bool hatTextur(const char* name) const;
+        DLLEXPORT bool hasTexture(const char* name) const;
         //! Returns a specific texture
         //! \param name The name of the texture
-        DLLEXPORT Textur* getTextur(const char* name) const;
+        DLLEXPORT Texture* getTexture(const char* name) const;
         //! Returns a specific texture
         //! \param id The id of the texture
-        DLLEXPORT Textur* getTextur(int id) const;
+        DLLEXPORT Texture* getTexture(int id) const;
         //! Returns a specific texture without increased reference counter
         //! \param name The name of the texture
-        DLLEXPORT Textur* zTextur(const char* name) const;
+        DLLEXPORT Texture* zTexture(const char* name) const;
         //! Returns a specific texture without increased reference counter
         //! \param id The id of the texture
-        DLLEXPORT Textur* zTextur(int id) const;
+        DLLEXPORT Texture* zTexture(int id) const;
         //! Initializes static private members. Called automatically by the
         //! framework.
         static void init();

TextureModel.cpp

@@ -9,14 +9,14 @@
 
 using namespace Framework;
 
-// Contents of the TexturModel class
+// Contents of the TextureModel class
 
 // Constructor
-TexturModel::TexturModel(GraphicsApi* zApi)
-    : TexturModel(zApi, Standart3DTypes::texturModel)
+TextureModel::TextureModel(GraphicsApi* zApi)
+    : TextureModel(zApi, Standart3DTypes::texturModel)
 {}
 
-Framework::TexturModel::TexturModel(GraphicsApi* zApi, const char* uniqueName)
+Framework::TextureModel::TextureModel(GraphicsApi* zApi, const char* uniqueName)
 {
     if (zApi->hasModel(uniqueName))
         model = zApi->getModel(uniqueName);
@@ -49,21 +49,21 @@ Framework::TexturModel::TexturModel(GraphicsApi* zApi, const char* uniqueName)
 
         model->calculateNormals();
     }
-    textur = new Model3DTextur();
+    textur = new Model3DTexture();
 }
 
 // Sets the texture to be displayed
 //  t: The texture
-void TexturModel::setTextur(Textur* t)
+void TextureModel::setTexture(Texture* t)
 {
     if (!t) return;
-    this->textur->setPolygonTextur(0, t);
+    this->textur->setPolygonTexture(0, t);
     rend = 1;
 }
 
 // Sets the size in which the texture is displayed
 //  gr: A vector containing width and height for x and y
-void TexturModel::setSize(Vec2<float> gr)
+void TextureModel::setSize(Vec2<float> gr)
 {
     gr /= 2;
     Vertex3D* vertecies = new Vertex3D[4];
@@ -83,7 +83,7 @@ void TexturModel::setSize(Vec2<float> gr)
 // Sets the size in which the texture is displayed
 //  b: The width in which the texture is displayed
 //  h: The height in which the texture is displayed
-void TexturModel::setSize(float b, float h)
+void TextureModel::setSize(float b, float h)
 {
     b /= 2;
     h /= 2;

TextureModel.h

@@ -4,19 +4,19 @@
 
 namespace Framework
 {
-    class Textur;
+    class Texture;
     class GraphicsApi;
 
     //! A 3D model that can be used to display a texture in three-dimensional space
-    class TexturModel : public Model3D
+    class TextureModel : public Model3D
     {
     public:
         //! Constructor
-        DLLEXPORT TexturModel(GraphicsApi* zApi);
-        DLLEXPORT TexturModel(GraphicsApi* zApi, const char* uniqueName);
+        DLLEXPORT TextureModel(GraphicsApi* zApi);
+        DLLEXPORT TextureModel(GraphicsApi* zApi, const char* uniqueName);
         //! Sets the texture to be displayed
         //! \param t The texture
-        DLLEXPORT void setTextur(Textur* t);
+        DLLEXPORT void setTexture(Texture* t);
         //! Sets the size in which the texture is displayed
         //! \param gr A vector containing width and height for x and y
         DLLEXPORT void setSize(Vec2<float> gr);

Thread.cpp

@@ -282,7 +282,7 @@ void ThreadRegister::unlock()
 void ThreadRegister::cleanUpClosedThreads()
 {
     EnterCriticalSection(&cs);
-    while (closedThreads.getEintragAnzahl() > 0)
+    while (closedThreads.getEntryCount() > 0)
     {
 #ifndef WIN32
         pthread_join(closedThreads.get(0), 0);

Time.cpp

@@ -71,9 +71,9 @@ int gettimeofday(struct timeval* tv, struct timezone* tz)
 
 using namespace Framework;
 
-// Content of the Uhrzeit class from Time.h
+// Content of the Clock class from Time.h
 // Private
-int Uhrzeit::update() // calculates the new time
+int Clock::update() // calculates the new time
 {
     __int64 mins = sekunde / 60;
     minute = minute + mins;
@@ -101,14 +101,14 @@ int Uhrzeit::update() // calculates the new time
     return days;
 }
 
-Uhrzeit::Uhrzeit()
+Clock::Clock()
     : ReferenceCounter(),
       stunde(0),
       minute(0),
       sekunde(0)
 {}
 
-int Uhrzeit::setUhrzeit(Uhrzeit* zeit) // sets the time
+int Clock::setClock(Clock* zeit) // sets the time
 {
     stunde = zeit->getStunde();
     minute = zeit->getMinute();
@@ -117,7 +117,7 @@ int Uhrzeit::setUhrzeit(Uhrzeit* zeit) // sets the time
     return update();
 }
 
-int Uhrzeit::setUhrzeit(int stunde, int minute, int sekunde)
+int Clock::setClock(int stunde, int minute, int sekunde)
 {
     this->stunde = stunde;
     this->minute = minute;
@@ -125,7 +125,7 @@ int Uhrzeit::setUhrzeit(int stunde, int minute, int sekunde)
     return update();
 }
 
-int Uhrzeit::setUhrzeit(
+int Clock::setClock(
 const char* format, const char* zeit) // format examples: "H:i:s", "H-i-s"
                                       // (H=hour,i=minute,s=second)
 {
@@ -158,32 +158,32 @@ const char* format, const char* zeit) // format examples: "H:i:s", "H-i-s"
     return update();
 }
 
-int Uhrzeit::setUhrzeit(const char* format, Text* zeit)
+int Clock::setClock(const char* format, Text* zeit)
 {
-    int ret = setUhrzeit(format, zeit->getText());
+    int ret = setClock(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-int Uhrzeit::setStunde(int stunde) // sets the hour
+int Clock::setStunde(int stunde) // sets the hour
 {
     this->stunde = stunde;
     return update();
 }
 
-int Uhrzeit::setMinute(int minute) // sets the minute
+int Clock::setMinute(int minute) // sets the minute
 {
     this->minute = minute;
     return update();
 }
 
-int Uhrzeit::setSekunde(int sekunde) // sets the second
+int Clock::setSekunde(int sekunde) // sets the second
 {
     this->sekunde = sekunde;
     return update();
 }
 
-int Uhrzeit::plusUhrzeit(Uhrzeit* zeit) // adds the times
+int Clock::plusClock(Clock* zeit) // adds the times
 {
     stunde += zeit->getStunde();
     minute += zeit->getMinute();
@@ -191,7 +191,7 @@ int Uhrzeit::plusUhrzeit(Uhrzeit* zeit) // adds the times
     return update();
 }
 
-int Uhrzeit::plusUhrzeit(int stunde, int minute, int sekunde)
+int Clock::plusClock(int stunde, int minute, int sekunde)
 {
     this->stunde += stunde;
     this->minute += minute;
@@ -199,7 +199,7 @@ int Uhrzeit::plusUhrzeit(int stunde, int minute, int sekunde)
     return update();
 }
 
-int Uhrzeit::plusUhrzeit(const char* format, const char* zeit)
+int Clock::plusClock(const char* format, const char* zeit)
 {
     int flen = textLength(format);
     char* ende = 0;
@@ -230,32 +230,32 @@ int Uhrzeit::plusUhrzeit(const char* format, const char* zeit)
     return update();
 }
 
-int Uhrzeit::plusUhrzeit(const char* format, Text* zeit)
+int Clock::plusClock(const char* format, Text* zeit)
 {
-    int ret = plusUhrzeit(format, zeit->getText());
+    int ret = plusClock(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-int Uhrzeit::plusStunde(__int64 stunde) // adds stunde hours
+int Clock::plusStunde(__int64 stunde) // adds stunde hours
 {
     this->stunde += stunde;
     return update();
 }
 
-int Uhrzeit::plusMinute(__int64 minute) // adds minute minutes
+int Clock::plusMinute(__int64 minute) // adds minute minutes
 {
     this->minute += minute;
     return update();
 }
 
-int Uhrzeit::plusSekunde(__int64 sekunde) // adds sekunde seconds
+int Clock::plusSekunde(__int64 sekunde) // adds sekunde seconds
 {
     this->sekunde += sekunde;
     return update();
 }
 
-int Uhrzeit::minusUhrzeit(Uhrzeit* zeit) // subtracts the times
+int Clock::minusClock(Clock* zeit) // subtracts the times
 {
     stunde -= zeit->getStunde();
     minute -= zeit->getMinute();
@@ -264,7 +264,7 @@ int Uhrzeit::minusUhrzeit(Uhrzeit* zeit) // subtracts the times
     return update();
 }
 
-int Uhrzeit::minusUhrzeit(int stunde, int minute, int sekunde)
+int Clock::minusClock(int stunde, int minute, int sekunde)
 {
     this->stunde -= stunde;
     this->minute -= minute;
@@ -272,7 +272,7 @@ int Uhrzeit::minusUhrzeit(int stunde, int minute, int sekunde)
     return update();
 }
 
-int Uhrzeit::minusUhrzeit(const char* format, const char* zeit)
+int Clock::minusClock(const char* format, const char* zeit)
 {
     int flen = textLength(format);
     char* ende = 0;
@@ -303,48 +303,48 @@ int Uhrzeit::minusUhrzeit(const char* format, const char* zeit)
     return update();
 }
 
-int Uhrzeit::minusUhrzeit(const char* format, Text* zeit)
+int Clock::minusClock(const char* format, Text* zeit)
 {
-    int ret = plusUhrzeit(format, zeit->getText());
+    int ret = plusClock(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-int Uhrzeit::minusStunde(__int64 stunde) // subtracts stunde hours
+int Clock::minusStunde(__int64 stunde) // subtracts stunde hours
 {
     this->stunde -= stunde;
     return update();
 }
 
-int Uhrzeit::minusMinute(__int64 minute) // subtracts minute minutes
+int Clock::minusMinute(__int64 minute) // subtracts minute minutes
 {
     this->minute -= minute;
     return update();
 }
 
-int Uhrzeit::minusSekunde(__int64 sekunde) // subtracts sekunde seconds
+int Clock::minusSekunde(__int64 sekunde) // subtracts sekunde seconds
 {
     this->sekunde -= sekunde;
     return update();
 }
 
 // constant
-int Uhrzeit::getStunde() const // returns the hour
+int Clock::getStunde() const // returns the hour
 {
     return (int)stunde;
 }
 
-int Uhrzeit::getMinute() const // returns the minute
+int Clock::getMinute() const // returns the minute
 {
     return (int)minute;
 }
 
-int Uhrzeit::getSekunde() const // returns the second
+int Clock::getSekunde() const // returns the second
 {
     return (int)sekunde;
 }
 
-Text* Uhrzeit::getUhrzeit(
+Text* Clock::getClock(
 const char* format) const // returns the time formatted as text
 {
     Text* ret = new Text("");
@@ -370,8 +370,8 @@ const char* format) const // returns the time formatted as text
     return ret;
 }
 
-bool Uhrzeit::istGleich(
-Uhrzeit* zeit) const // checks if the time equals zeit
+bool Clock::istGleich(
+Clock* zeit) const // checks if the time equals zeit
 {
     bool ret = stunde == zeit->getStunde() && minute == zeit->getMinute()
             && sekunde == zeit->getSekunde();
@@ -379,7 +379,7 @@ Uhrzeit* zeit) const // checks if the time equals zeit
     return ret;
 }
 
-bool Uhrzeit::istGleich(const char* format, const char* zeit) const
+bool Clock::istGleich(const char* format, const char* zeit) const
 {
     int st = (int)stunde, min = (int)minute, sek = (int)sekunde;
     int flen = textLength(format);
@@ -412,39 +412,39 @@ bool Uhrzeit::istGleich(const char* format, const char* zeit) const
     return ret;
 }
 
-bool Uhrzeit::istGleich(const char* format, Text* zeit) const
+bool Clock::istGleich(const char* format, Text* zeit) const
 {
     bool ret = istGleich(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-bool Uhrzeit::istGleich(int stunde, int minute, int sekunde) const
+bool Clock::istGleich(int stunde, int minute, int sekunde) const
 {
     return this->stunde == stunde && this->minute == minute
         && this->sekunde == sekunde;
 }
 
-bool Uhrzeit::stundeGleich(
+bool Clock::stundeGleich(
 int stunde) const // checks if the hour equals stunde
 {
     return this->stunde == stunde;
 }
 
-bool Uhrzeit::minuteGleich(
+bool Clock::minuteGleich(
 int minute) const // checks if the minute equals minute
 {
     return this->minute == minute;
 }
 
-bool Uhrzeit::sekundeGleich(
+bool Clock::sekundeGleich(
 int sekunde) const // checks if the second equals sekunde
 {
     return this->sekunde == sekunde;
 }
 
-bool Uhrzeit::istKleiner(
-Uhrzeit* zeit) const // checks if the time is less than zeit
+bool Clock::istKleiner(
+Clock* zeit) const // checks if the time is less than zeit
 {
     bool ret
         = istKleiner(zeit->getStunde(), zeit->getMinute(), zeit->getSekunde());
@@ -452,7 +452,7 @@ Uhrzeit* zeit) const // checks if the time is less than zeit
     return ret;
 }
 
-bool Uhrzeit::istKleiner(int stunde, int minute, int sekunde) const
+bool Clock::istKleiner(int stunde, int minute, int sekunde) const
 {
     if (this->stunde < stunde)
         return 1;
@@ -476,7 +476,7 @@ bool Uhrzeit::istKleiner(int stunde, int minute, int sekunde) const
         return 0;
 }
 
-bool Uhrzeit::istKleiner(const char* format, const char* zeit) const
+bool Clock::istKleiner(const char* format, const char* zeit) const
 {
     int st = (int)stunde, min = (int)minute, sek = (int)sekunde;
     int flen = textLength(format);
@@ -508,15 +508,15 @@ bool Uhrzeit::istKleiner(const char* format, const char* zeit) const
     return istKleiner(st, min, sek);
 }
 
-bool Uhrzeit::istKleiner(const char* format, Text* zeit) const
+bool Clock::istKleiner(const char* format, Text* zeit) const
 {
     bool ret = istKleiner(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-bool Uhrzeit::istLater(
-Uhrzeit* zeit) const // checks if the time is greater than zeit
+bool Clock::istLater(
+Clock* zeit) const // checks if the time is greater than zeit
 {
     bool ret
         = istLater(zeit->getStunde(), zeit->getMinute(), zeit->getSekunde());
@@ -524,7 +524,7 @@ Uhrzeit* zeit) const // checks if the time is greater than zeit
     return ret;
 }
 
-bool Uhrzeit::istLater(int stunde, int minute, int sekunde) const
+bool Clock::istLater(int stunde, int minute, int sekunde) const
 {
     if (this->stunde > stunde)
         return 1;
@@ -548,7 +548,7 @@ bool Uhrzeit::istLater(int stunde, int minute, int sekunde) const
         return 0;
 }
 
-bool Uhrzeit::istLater(const char* format, const char* zeit) const
+bool Clock::istLater(const char* format, const char* zeit) const
 {
     int st = (int)stunde, min = (int)minute, sek = (int)sekunde;
     int flen = textLength(format);
@@ -580,16 +580,16 @@ bool Uhrzeit::istLater(const char* format, const char* zeit) const
     return istLater(st, min, sek);
 }
 
-bool Uhrzeit::istLater(const char* format, Text* zeit) const
+bool Clock::istLater(const char* format, Text* zeit) const
 {
     bool ret = istLater(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-// Content of the Datum class from Time.h
+// Content of the Date class from Time.h
 // Private
-void Datum::update() // calculates the new date
+void Date::update() // calculates the new date
 {
     while (monat > 12)
     {
@@ -636,7 +636,7 @@ void Datum::update() // calculates the new date
 }
 
 // Constructor
-Datum::Datum()
+Date::Date()
     : ReferenceCounter(),
       jahr(0),
       monat(0),
@@ -648,13 +648,13 @@ Datum::Datum()
 }
 
 // Destructor
-Datum::~Datum()
+Date::~Date()
 {
     delete[] maxTage;
 }
 
 // non-constant
-void Datum::setDatum(Datum* datum) // sets the date
+void Date::setDate(Date* datum) // sets the date
 {
     jahr = datum->getJahr();
     monat = datum->getMonat();
@@ -663,7 +663,7 @@ void Datum::setDatum(Datum* datum) // sets the date
     update();
 }
 
-void Datum::setDatum(int jahr, int monat, int tag)
+void Date::setDate(int jahr, int monat, int tag)
 {
     this->jahr = jahr;
     this->monat = monat;
@@ -671,7 +671,7 @@ void Datum::setDatum(int jahr, int monat, int tag)
     update();
 }
 
-void Datum::setDatum(const char* format,
+void Date::setDate(const char* format,
 const char*
     datum) // format examples: "Y:m:d", "Y-m-d" (Y=year,m=month,d=day)
 {
@@ -704,31 +704,31 @@ const char*
     update();
 }
 
-void Datum::setDatum(const char* format, Text* datum)
+void Date::setDate(const char* format, Text* datum)
 {
-    setDatum(format, datum->getText());
+    setDate(format, datum->getText());
     datum->release();
 }
 
-void Datum::setJahr(int jahr) // sets the year
+void Date::setJahr(int jahr) // sets the year
 {
     this->jahr = jahr;
     update();
 }
 
-void Datum::setMonat(int monat) // sets the month
+void Date::setMonat(int monat) // sets the month
 {
     this->monat = monat;
     update();
 }
 
-void Datum::setTag(int tag) // sets the day
+void Date::setTag(int tag) // sets the day
 {
     this->tag = tag;
     update();
 }
 
-void Datum::plusDatum(Datum* datum) // adds the date
+void Date::plusDate(Date* datum) // adds the date
 {
     this->jahr += datum->getJahr();
     this->monat += datum->getMonat();
@@ -737,7 +737,7 @@ void Datum::plusDatum(Datum* datum) // adds the date
     update();
 }
 
-void Datum::plusDatum(int jahr, int monat, int tag)
+void Date::plusDate(int jahr, int monat, int tag)
 {
     this->jahr += jahr;
     this->monat += monat;
@@ -745,7 +745,7 @@ void Datum::plusDatum(int jahr, int monat, int tag)
     update();
 }
 
-void Datum::plusDatum(const char* format, const char* datum)
+void Date::plusDate(const char* format, const char* datum)
 {
     int flen = textLength(format);
     char* ende = 0;
@@ -776,31 +776,31 @@ void Datum::plusDatum(const char* format, const char* datum)
     update();
 }
 
-void Datum::plusDatum(const char* format, Text* datum)
+void Date::plusDate(const char* format, Text* datum)
 {
-    plusDatum(format, datum->getText());
+    plusDate(format, datum->getText());
     datum->release();
 }
 
-void Datum::plusJahr(int jahr) // adds jahr years
+void Date::plusJahr(int jahr) // adds jahr years
 {
     this->jahr += jahr;
     update();
 }
 
-void Datum::plusMonat(int monat) // adds monat months
+void Date::plusMonat(int monat) // adds monat months
 {
     this->monat = monat;
     update();
 }
 
-void Datum::plusTag(int tag) // adds tag days
+void Date::plusTag(int tag) // adds tag days
 {
     this->tag += tag;
     update();
 }
 
-void Datum::minusDatum(Datum* datum) // subtracts the date
+void Date::minusDate(Date* datum) // subtracts the date
 {
     jahr -= datum->getJahr();
     monat -= datum->getMonat();
@@ -809,7 +809,7 @@ void Datum::minusDatum(Datum* datum) // subtracts the date
     update();
 }
 
-void Datum::minusDatum(int jahr, int monat, int tag)
+void Date::minusDate(int jahr, int monat, int tag)
 {
     this->jahr -= jahr;
     this->monat -= monat;
@@ -817,7 +817,7 @@ void Datum::minusDatum(int jahr, int monat, int tag)
     update();
 }
 
-void Datum::minusDatum(const char* format, const char* datum)
+void Date::minusDate(const char* format, const char* datum)
 {
     int flen = textLength(format);
     char* ende = 0;
@@ -848,47 +848,47 @@ void Datum::minusDatum(const char* format, const char* datum)
     update();
 }
 
-void Datum::minusDatum(const char* format, Text* datum)
+void Date::minusDate(const char* format, Text* datum)
 {
-    minusDatum(format, datum->getText());
+    minusDate(format, datum->getText());
     datum->release();
 }
 
-void Datum::minusJahr(int jahr) // subtracts jahr years
+void Date::minusJahr(int jahr) // subtracts jahr years
 {
     this->jahr -= jahr;
     update();
 }
 
-void Datum::minusMonat(int monat) // subtracts monat months
+void Date::minusMonat(int monat) // subtracts monat months
 {
     this->monat -= monat;
     update();
 }
 
-void Datum::minusTag(int tag) // subtracts tag days
+void Date::minusTag(int tag) // subtracts tag days
 {
     this->tag -= tag;
     update();
 }
 
 // constant
-int Datum::getJahr() const // returns the year
+int Date::getJahr() const // returns the year
 {
     return jahr;
 }
 
-int Datum::getMonat() const // returns the month
+int Date::getMonat() const // returns the month
 {
     return monat;
 }
 
-int Datum::getTag() const // returns the day
+int Date::getTag() const // returns the day
 {
     return tag;
 }
 
-Text* Datum::getDatum(
+Text* Date::getDate(
 const char* format) const // returns the date formatted as text
 {
     Text* ret = new Text("");
@@ -914,8 +914,8 @@ const char* format) const // returns the date formatted as text
     return ret;
 }
 
-bool Datum::istGleich(
-Datum* datum) const // checks if the date equals datum
+bool Date::istGleich(
+Date* datum) const // checks if the date equals datum
 {
     bool ret = jahr == datum->getJahr() && monat == datum->getMonat()
             && tag == datum->getTag();
@@ -923,7 +923,7 @@ Datum* datum) const // checks if the date equals datum
     return ret;
 }
 
-bool Datum::istGleich(const char* format, const char* datum) const
+bool Date::istGleich(const char* format, const char* datum) const
 {
     int j = jahr, m = monat, t = tag;
     int flen = textLength(format);
@@ -956,43 +956,43 @@ bool Datum::istGleich(const char* format, const char* datum) const
     return ret;
 }
 
-bool Datum::istGleich(const char* format, Text* datum) const
+bool Date::istGleich(const char* format, Text* datum) const
 {
     bool ret = istGleich(format, datum->getText());
     datum->release();
     return ret;
 }
 
-bool Datum::istGleich(int jahr, int monat, int tag) const
+bool Date::istGleich(int jahr, int monat, int tag) const
 {
     return this->jahr == jahr && this->monat == monat && this->tag == tag;
 }
 
-bool Datum::jahrGleich(int jahr) const // checks if the year equals jahr
+bool Date::jahrGleich(int jahr) const // checks if the year equals jahr
 {
     return this->jahr == jahr;
 }
 
-bool Datum::monatGleich(
+bool Date::monatGleich(
 int monat) const // checks if the month equals monat
 {
     return this->monat == monat;
 }
 
-bool Datum::tagGleich(int tag) const // checks if the day equals tag
+bool Date::tagGleich(int tag) const // checks if the day equals tag
 {
     return this->tag == tag;
 }
 
-bool Datum::istKleiner(
-Datum* datum) const // checks if the date is less than datum
+bool Date::istKleiner(
+Date* datum) const // checks if the date is less than datum
 {
     bool ret = istKleiner(datum->getJahr(), datum->getMonat(), datum->getTag());
     datum->release();
     return ret;
 }
 
-bool Datum::istKleiner(int jahr, int monat, int tag) const
+bool Date::istKleiner(int jahr, int monat, int tag) const
 {
     if (this->jahr < jahr)
         return 1;
@@ -1016,7 +1016,7 @@ bool Datum::istKleiner(int jahr, int monat, int tag) const
         return 0;
 }
 
-bool Datum::istKleiner(const char* format, const char* datum) const
+bool Date::istKleiner(const char* format, const char* datum) const
 {
     int j = jahr, m = monat, t = tag;
     int flen = textLength(format);
@@ -1048,22 +1048,22 @@ bool Datum::istKleiner(const char* format, const char* datum) const
     return istKleiner(j, m, t);
 }
 
-bool Datum::istKleiner(const char* format, Text* datum) const
+bool Date::istKleiner(const char* format, Text* datum) const
 {
     bool ret = istKleiner(format, datum->getText());
     datum->release();
     return ret;
 }
 
-bool Datum::istLater(
-Datum* datum) const // checks if the date is greater than datum
+bool Date::istLater(
+Date* datum) const // checks if the date is greater than datum
 {
     bool ret = istLater(datum->getJahr(), datum->getMonat(), datum->getTag());
     datum->release();
     return ret;
 }
 
-bool Datum::istLater(int jahr, int monat, int tag) const
+bool Date::istLater(int jahr, int monat, int tag) const
 {
     if (this->jahr > jahr)
         return 1;
@@ -1087,7 +1087,7 @@ bool Datum::istLater(int jahr, int monat, int tag) const
         return 0;
 }
 
-bool Datum::istLater(const char* format, const char* datum) const
+bool Date::istLater(const char* format, const char* datum) const
 {
     int j = jahr, m = monat, t = tag;
     int flen = textLength(format);
@@ -1119,54 +1119,54 @@ bool Datum::istLater(const char* format, const char* datum) const
     return istLater(j, m, t);
 }
 
-bool Datum::istLater(const char* format, Text* datum) const
+bool Date::istLater(const char* format, Text* datum) const
 {
     bool ret = istLater(format, datum->getText());
     datum->release();
     return ret;
 }
 
-// Content of the Zeit class from Time.h
+// Content of the Time class from Time.h
 // Constructor
-Zeit::Zeit()
+Time::Time()
     : ReferenceCounter(),
-      datum(new Datum()),
-      uhrzeit(new Uhrzeit())
+      datum(new Date()),
+      uhrzeit(new Clock())
 {}
 
-//! Creates a new Zeit with the elapsed seconds since 1970.
-Zeit::Zeit(__int64 timestamp)
+//! Creates a new Time with the elapsed seconds since 1970.
+Time::Time(__int64 timestamp)
     : ReferenceCounter(),
-      datum(new Datum()),
-      uhrzeit(new Uhrzeit())
+      datum(new Date()),
+      uhrzeit(new Clock())
 {
-    datum->setDatum(1970, 1, 1);
+    datum->setDate(1970, 1, 1);
     plusSekunde(timestamp);
 }
 
 // Destructor
-Zeit::~Zeit()
+Time::~Time()
 {
     datum->release();
     uhrzeit->release();
 }
 
 // non-constant
-void Zeit::setZeit(Zeit* zeit) // sets the time
+void Time::setTime(Time* zeit) // sets the time
 {
-    datum->setDatum(zeit->getDatum());
-    datum->plusTag(uhrzeit->setUhrzeit(zeit->getUhrzeit()));
+    datum->setDate(zeit->getDate());
+    datum->plusTag(uhrzeit->setClock(zeit->getClock()));
     zeit->release();
 }
 
-void Zeit::setZeit(
+void Time::setTime(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde)
 {
-    datum->setDatum(jahr, monat, tag);
-    datum->plusTag(uhrzeit->setUhrzeit(stunde, minute, sekunde));
+    datum->setDate(jahr, monat, tag);
+    datum->plusTag(uhrzeit->setClock(stunde, minute, sekunde));
 }
 
-void Zeit::setZeit(const char* format,
+void Time::setTime(const char* format,
 const char* zeit) // format examples: "Y:m:d H-i-s", "Y-m-d H:i:s"
                   // (Y=year,m=month,d=day,H=hour,i=minute,s=second)
 {
@@ -1218,61 +1218,61 @@ const char* zeit) // format examples: "Y:m:d H-i-s", "Y-m-d H:i:s"
             break;
         }
     }
-    datum->setDatum(y, m, d);
-    datum->plusTag(uhrzeit->setUhrzeit(h, i, s));
+    datum->setDate(y, m, d);
+    datum->plusTag(uhrzeit->setClock(h, i, s));
 }
 
-void Zeit::setZeit(const char* format, Text* zeit)
+void Time::setTime(const char* format, Text* zeit)
 {
-    setZeit(format, zeit->getText());
+    setTime(format, zeit->getText());
     zeit->release();
 }
 
-void Zeit::setJahr(int jahr) // sets the year
+void Time::setJahr(int jahr) // sets the year
 {
     datum->setJahr(jahr);
 }
 
-void Zeit::setMonat(int monat) // sets the month
+void Time::setMonat(int monat) // sets the month
 {
     datum->setMonat(monat);
 }
 
-void Zeit::setTag(int tag) // sets the day
+void Time::setTag(int tag) // sets the day
 {
     datum->setTag(tag);
 }
 
-void Zeit::setStunde(int stunde) // sets the hour
+void Time::setStunde(int stunde) // sets the hour
 {
     datum->plusTag(uhrzeit->setStunde(stunde));
 }
 
-void Zeit::setMinute(int minute) // sets the minute
+void Time::setMinute(int minute) // sets the minute
 {
     datum->plusTag(uhrzeit->setMinute(minute));
 }
 
-void Zeit::setSekunde(int sekunde) // sets the second
+void Time::setSekunde(int sekunde) // sets the second
 {
     datum->plusTag(uhrzeit->setSekunde(sekunde));
 }
 
-void Zeit::plusZeit(Zeit* zeit) // adds the time
+void Time::plusTime(Time* zeit) // adds the time
 {
-    datum->plusDatum(zeit->getDatum());
-    datum->plusTag(uhrzeit->plusUhrzeit(zeit->getUhrzeit()));
+    datum->plusDate(zeit->getDate());
+    datum->plusTag(uhrzeit->plusClock(zeit->getClock()));
     zeit->release();
 }
 
-void Zeit::plusZeit(
+void Time::plusTime(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde)
 {
-    datum->plusDatum(jahr, monat, tag);
-    datum->plusTag(uhrzeit->plusUhrzeit(stunde, minute, sekunde));
+    datum->plusDate(jahr, monat, tag);
+    datum->plusTag(uhrzeit->plusClock(stunde, minute, sekunde));
 }
 
-void Zeit::plusZeit(const char* format, const char* zeit)
+void Time::plusTime(const char* format, const char* zeit)
 {
     int y = datum->getJahr();
     int m = datum->getMonat();
@@ -1322,61 +1322,61 @@ void Zeit::plusZeit(const char* format, const char* zeit)
             break;
         }
     }
-    datum->setDatum(y, m, d);
-    datum->plusTag(uhrzeit->setUhrzeit(h, i, s));
+    datum->setDate(y, m, d);
+    datum->plusTag(uhrzeit->setClock(h, i, s));
 }
 
-void Zeit::plusZeit(const char* format, Text* zeit)
+void Time::plusTime(const char* format, Text* zeit)
 {
-    plusZeit(format, zeit->getText());
+    plusTime(format, zeit->getText());
     zeit->release();
 }
 
-void Zeit::plusJahr(int jahr) // adds jahr years
+void Time::plusJahr(int jahr) // adds jahr years
 {
     datum->plusJahr(jahr);
 }
 
-void Zeit::plusMonat(int monat) // adds monat months
+void Time::plusMonat(int monat) // adds monat months
 {
     datum->plusMonat(monat);
 }
 
-void Zeit::plusTag(int tag) // adds tag days
+void Time::plusTag(int tag) // adds tag days
 {
     datum->plusTag(tag);
 }
 
-void Zeit::plusStunde(__int64 stunde) // adds stunde hours
+void Time::plusStunde(__int64 stunde) // adds stunde hours
 {
     datum->plusTag(uhrzeit->plusStunde(stunde));
 }
 
-void Zeit::plusMinute(__int64 minute) // adds minute minutes
+void Time::plusMinute(__int64 minute) // adds minute minutes
 {
     datum->plusTag(uhrzeit->plusMinute(minute));
 }
 
-void Zeit::plusSekunde(__int64 sekunde) // adds sekunde seconds
+void Time::plusSekunde(__int64 sekunde) // adds sekunde seconds
 {
     datum->plusTag(uhrzeit->plusSekunde(sekunde));
 }
 
-void Zeit::minusZeit(Zeit* zeit) // subtracts the time
+void Time::minusTime(Time* zeit) // subtracts the time
 {
-    datum->minusDatum(zeit->getDatum());
-    datum->plusTag(uhrzeit->minusUhrzeit(zeit->getUhrzeit()));
+    datum->minusDate(zeit->getDate());
+    datum->plusTag(uhrzeit->minusClock(zeit->getClock()));
     zeit->release();
 }
 
-void Zeit::minusZeit(
+void Time::minusTime(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde)
 {
-    datum->minusDatum(jahr, monat, tag);
-    datum->plusTag(uhrzeit->plusUhrzeit(stunde, minute, sekunde));
+    datum->minusDate(jahr, monat, tag);
+    datum->plusTag(uhrzeit->plusClock(stunde, minute, sekunde));
 }
 
-void Zeit::minusZeit(const char* format, const char* zeit)
+void Time::minusTime(const char* format, const char* zeit)
 {
     int y = datum->getJahr();
     int m = datum->getMonat();
@@ -1426,48 +1426,48 @@ void Zeit::minusZeit(const char* format, const char* zeit)
             break;
         }
     }
-    datum->setDatum(y, m, d);
-    datum->plusTag(uhrzeit->setUhrzeit(h, i, s));
+    datum->setDate(y, m, d);
+    datum->plusTag(uhrzeit->setClock(h, i, s));
 }
 
-void Zeit::minusZeit(const char* format, Text* zeit)
+void Time::minusTime(const char* format, Text* zeit)
 {
-    minusZeit(format, zeit->getText());
+    minusTime(format, zeit->getText());
     zeit->release();
 }
 
-void Zeit::minusJahr(int jahr) // subtracts jahr years
+void Time::minusJahr(int jahr) // subtracts jahr years
 {
     datum->minusJahr(jahr);
 }
 
-void Zeit::minusMonat(int monat) // subtracts monat months
+void Time::minusMonat(int monat) // subtracts monat months
 {
     datum->minusMonat(monat);
 }
 
-void Zeit::minusTag(int tag) // subtracts tag days
+void Time::minusTag(int tag) // subtracts tag days
 {
     datum->minusTag(tag);
 }
 
-void Zeit::minusStunde(__int64 stunde) // subtracts stunde hours
+void Time::minusStunde(__int64 stunde) // subtracts stunde hours
 {
     datum->plusTag(uhrzeit->minusStunde(stunde));
 }
 
-void Zeit::minusMinute(__int64 minute) // subtracts minute minutes
+void Time::minusMinute(__int64 minute) // subtracts minute minutes
 {
     datum->plusTag(uhrzeit->minusMinute(minute));
 }
 
-void Zeit::minusSekunde(__int64 sekunde) // subtracts sekunde seconds
+void Time::minusSekunde(__int64 sekunde) // subtracts sekunde seconds
 {
     datum->plusTag(uhrzeit->minusSekunde(sekunde));
 }
 
 // constant
-Text* Zeit::getZeit(
+Text* Time::getTime(
 const char* format) const // returns the time formatted as text
 {
     Text* ret = new Text("");
@@ -1506,15 +1506,15 @@ const char* format) const // returns the time formatted as text
     return ret;
 }
 
-bool Zeit::istGleich(Zeit* zeit) const // checks if the time equals zeit
+bool Time::istGleich(Time* zeit) const // checks if the time equals zeit
 {
-    bool ret = datum->istGleich(zeit->getDatum())
-            && uhrzeit->istGleich(zeit->getUhrzeit());
+    bool ret = datum->istGleich(zeit->getDate())
+            && uhrzeit->istGleich(zeit->getClock());
     zeit->release();
     return ret;
 }
 
-bool Zeit::istGleich(const char* format, const char* zeit) const
+bool Time::istGleich(const char* format, const char* zeit) const
 {
     int y = datum->getJahr();
     int m = datum->getMonat();
@@ -1567,51 +1567,51 @@ bool Zeit::istGleich(const char* format, const char* zeit) const
     return datum->istGleich(y, m, d) && uhrzeit->istGleich(h, i, s);
 }
 
-bool Zeit::istGleich(const char* format, Text* zeit) const
+bool Time::istGleich(const char* format, Text* zeit) const
 {
     bool ret = istGleich(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-bool Zeit::istGleich(
+bool Time::istGleich(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde) const
 {
     return datum->istGleich(jahr, monat, tag)
         && uhrzeit->istGleich(stunde, minute, sekunde);
 }
 
-Datum* Zeit::getDatum() const // returns the date
+Date* Time::getDate() const // returns the date
 {
-    return dynamic_cast<Datum*>(datum->getThis());
+    return dynamic_cast<Date*>(datum->getThis());
 }
 
-Datum* Zeit::zDatum() const
+Date* Time::zDate() const
 {
     return datum;
 }
 
-Uhrzeit* Zeit::getUhrzeit() const // returns the time of day
+Clock* Time::getClock() const // returns the time of day
 {
-    return dynamic_cast<Uhrzeit*>(uhrzeit->getThis());
+    return dynamic_cast<Clock*>(uhrzeit->getThis());
 }
 
-Uhrzeit* Zeit::zUhrzeit() const
+Clock* Time::zClock() const
 {
     return uhrzeit;
 }
 
-bool Zeit::istKleiner(
-Zeit* zeit) const // checks if the time is less than zeit
+bool Time::istKleiner(
+Time* zeit) const // checks if the time is less than zeit
 {
-    if (datum->istKleiner(zeit->getDatum()))
+    if (datum->istKleiner(zeit->getDate()))
     {
         zeit->release();
         return 1;
     }
-    else if (datum->istGleich(zeit->getDatum()))
+    else if (datum->istGleich(zeit->getDate()))
     {
-        if (uhrzeit->istKleiner(zeit->getUhrzeit()))
+        if (uhrzeit->istKleiner(zeit->getClock()))
         {
             zeit->release();
             return 1;
@@ -1629,7 +1629,7 @@ Zeit* zeit) const // checks if the time is less than zeit
     }
 }
 
-bool Zeit::istKleiner(
+bool Time::istKleiner(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde) const
 {
     if (datum->istKleiner(jahr, monat, tag))
@@ -1645,7 +1645,7 @@ bool Zeit::istKleiner(
         return 0;
 }
 
-bool Zeit::istKleiner(const char* format, const char* zeit) const
+bool Time::istKleiner(const char* format, const char* zeit) const
 {
     int y = datum->getJahr();
     int m = datum->getMonat();
@@ -1708,24 +1708,24 @@ bool Zeit::istKleiner(const char* format, const char* zeit) const
         return 0;
 }
 
-bool Zeit::istKleiner(const char* format, Text* zeit) const
+bool Time::istKleiner(const char* format, Text* zeit) const
 {
     bool ret = istKleiner(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-bool Zeit::istLater(
-Zeit* zeit) const // checks if the time is greater than zeit
+bool Time::istLater(
+Time* zeit) const // checks if the time is greater than zeit
 {
-    if (datum->istLater(zeit->getDatum()))
+    if (datum->istLater(zeit->getDate()))
     {
         zeit->release();
         return 1;
     }
-    else if (datum->istGleich(zeit->getDatum()))
+    else if (datum->istGleich(zeit->getDate()))
     {
-        if (uhrzeit->istLater(zeit->getUhrzeit()))
+        if (uhrzeit->istLater(zeit->getClock()))
         {
             zeit->release();
             return 1;
@@ -1743,7 +1743,7 @@ Zeit* zeit) const // checks if the time is greater than zeit
     }
 }
 
-bool Zeit::istLater(
+bool Time::istLater(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde) const
 {
     if (datum->istLater(jahr, monat, tag))
@@ -1759,7 +1759,7 @@ bool Zeit::istLater(
         return 0;
 }
 
-bool Zeit::istLater(const char* format, const char* zeit) const
+bool Time::istLater(const char* format, const char* zeit) const
 {
     int y = datum->getJahr();
     int m = datum->getMonat();
@@ -1822,16 +1822,16 @@ bool Zeit::istLater(const char* format, const char* zeit) const
         return 0;
 }
 
-bool Zeit::istLater(const char* format, Text* zeit) const
+bool Time::istLater(const char* format, Text* zeit) const
 {
     bool ret = istLater(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-// Content of the ZeitMesser class from Time.h
+// Content of the Timer class from Time.h
 // Constructor
-ZeitMesser::ZeitMesser()
+Timer::Timer()
     : ReferenceCounter(),
       start(0),
       ende(0),
@@ -1839,17 +1839,17 @@ ZeitMesser::ZeitMesser()
 {}
 
 // Destructor
-ZeitMesser::~ZeitMesser() {}
+Timer::~Timer() {}
 
 // non-constant
-void ZeitMesser::messungStart() // sets the start point of the time measurement
+void Timer::messungStart() // sets the start point of the time measurement
 {
     timeval tv;
     gettimeofday(&tv, 0);
     start = (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
 }
 
-void ZeitMesser::messungEnde() // sets the end point of the time measurement
+void Timer::messungEnde() // sets the end point of the time measurement
 {
     timeval tv;
     gettimeofday(&tv, 0);
@@ -1858,75 +1858,75 @@ void ZeitMesser::messungEnde() // sets the end point of the time measurement
 }
 
 // constant
-double ZeitMesser::getSekunden() const // returns the second difference between
+double Timer::getSekunden() const // returns the second difference between
 // start and end of the measurement
 {
     return messung;
 }
 
-double ZeitMesser::getMinuten()
+double Timer::getMinuten()
 const // returns the minute difference between start and end of the measurement
 {
     return messung / 60;
 }
 
-double ZeitMesser::getStunden()
+double Timer::getStunden()
 const // returns the hour difference between start and end of the measurement
 {
     return messung / 3600;
 }
 
 //! returns true if a measurement is currently running
-DLLEXPORT bool ZeitMesser::isMeasuring() const
+DLLEXPORT bool Timer::isMeasuring() const
 {
     return start != 0;
 }
 
 // Global functions
-Uhrzeit* Framework::getUhrzeit() // returns the current time of day
+Clock* Framework::getClock() // returns the current time of day
 {
 #ifdef WIN32
-    Uhrzeit* ret = new Uhrzeit();
-    time_t Zeitstempel = time(0);
+    Clock* ret = new Clock();
+    time_t Timestamp = time(0);
     tm now;
-    localtime_s(&now, &Zeitstempel);
-    ret->setUhrzeit(now.tm_hour, now.tm_min, now.tm_sec);
+    localtime_s(&now, &Timestamp);
+    ret->setClock(now.tm_hour, now.tm_min, now.tm_sec);
     return ret;
 #else
-    Uhrzeit* ret = new Uhrzeit();
-    time_t Zeitstempel = time(0);
-    tm* now = localtime(&Zeitstempel);
-    ret->setUhrzeit(now->tm_hour, now->tm_min, now->tm_sec);
+    Clock* ret = new Clock();
+    time_t Timestamp = time(0);
+    tm* now = localtime(&Timestamp);
+    ret->setClock(now->tm_hour, now->tm_min, now->tm_sec);
     return ret;
 #endif
 }
 
-Datum* Framework::getDatum() // returns the current date
+Date* Framework::getDate() // returns the current date
 {
 #ifdef WIN32
-    Datum* ret = new Datum();
-    time_t Zeitstempel = time(0);
+    Date* ret = new Date();
+    time_t Timestamp = time(0);
     tm now;
-    localtime_s(&now, &Zeitstempel);
-    ret->setDatum(now.tm_year + 1900, now.tm_mon + 1, now.tm_mday);
+    localtime_s(&now, &Timestamp);
+    ret->setDate(now.tm_year + 1900, now.tm_mon + 1, now.tm_mday);
     return ret;
 #else
-    Datum* ret = new Datum();
-    time_t Zeitstempel = time(0);
-    tm* now = localtime(&Zeitstempel);
-    ret->setDatum(now->tm_year + 1900, now->tm_mon + 1, now->tm_mday);
+    Date* ret = new Date();
+    time_t Timestamp = time(0);
+    tm* now = localtime(&Timestamp);
+    ret->setDate(now->tm_year + 1900, now->tm_mon + 1, now->tm_mday);
     return ret;
 #endif
 }
 
-Zeit* Framework::getZeit() // returns the current time (date and time of day)
+Time* Framework::getTime() // returns the current time (date and time of day)
 {
 #ifdef WIN32
-    Zeit* ret = new Zeit();
-    time_t Zeitstempel = time(0);
+    Time* ret = new Time();
+    time_t Timestamp = time(0);
     tm now;
-    localtime_s(&now, &Zeitstempel);
-    ret->setZeit(now.tm_year + 1900,
+    localtime_s(&now, &Timestamp);
+    ret->setTime(now.tm_year + 1900,
         now.tm_mon + 1,
         now.tm_mday,
         now.tm_hour,
@@ -1934,10 +1934,10 @@ Zeit* Framework::getZeit() // returns the current time (date and time of day)
         now.tm_sec);
     return ret;
 #else
-    Zeit* ret = new Zeit();
-    time_t Zeitstempel = time(0);
-    tm* now = localtime(&Zeitstempel);
-    ret->setZeit(now->tm_year + 1900,
+    Time* ret = new Time();
+    time_t Timestamp = time(0);
+    tm* now = localtime(&Timestamp);
+    ret->setTime(now->tm_year + 1900,
         now->tm_mon + 1,
         now->tm_mday,
         now->tm_hour,

Time.h

@@ -1,5 +1,5 @@
-#ifndef Zeit_H
-#define Zeit_H
+#ifndef Time_H
+#define Time_H
 
 #include <time.h>
 
@@ -9,50 +9,50 @@
 namespace Framework
 {
     class Text;       //! Text.h
-    class Uhrzeit;    //! From this file
-    class Datum;      //! From this file
-    class Zeit;       //! From this file
-    class ZeitMesser; //! From this file
+    class Clock;    //! From this file
+    class Date;      //! From this file
+    class Time;       //! From this file
+    class Timer; //! From this file
 
     //! This class stores a time of day in the form of hours, minutes and
     //! seconds
-    class Uhrzeit : public virtual ReferenceCounter
+    class Clock : public virtual ReferenceCounter
     {
     private:
         __int64 stunde, minute, sekunde;
         int update();
 
     public:
-        //! Creates a new Uhrzeit object with the default values 00:00:00
-        DLLEXPORT Uhrzeit();
+        //! Creates a new Clock object with the default values 00:00:00
+        DLLEXPORT Clock();
 
         //! Sets the time by copying.
         //! \param zeit The values for hour, minute and second are
         //! copied from this object.
-        DLLEXPORT int setUhrzeit(Uhrzeit* zeit);
+        DLLEXPORT int setClock(Clock* zeit);
         //! Sets the time.
         //! \param stunde The hour of the new time.
         //! \param minute The minute of the new time.
         //! \param sekunde The second of the new time.
         //! \return The number of remaining days.
-        //! Example: setUhrzeit( 30, 30, 30 ); return: 1, stored: 6:30:30
-        DLLEXPORT int setUhrzeit(int stunde, int minute, int sekunde);
+        //! Example: setClock( 30, 30, 30 ); return: 1, stored: 6:30:30
+        DLLEXPORT int setClock(int stunde, int minute, int sekunde);
         //! Sets the time.
         //! \param format A string that determines the format of the
         //! time in (zeit). h=hour, i=minute, s=second. \param
         //! zeit A string containing the new time. \return The
-        //! number of remaining days. Example: setUhrzeit( "h:i:s", "05:30:00" );
-        //! Example: setUhrzeit( "h:i:s", "30:30:00" ); return: 1, stored:
+        //! number of remaining days. Example: setClock( "h:i:s", "05:30:00" );
+        //! Example: setClock( "h:i:s", "30:30:00" ); return: 1, stored:
         //! 6:30:00
-        DLLEXPORT int setUhrzeit(const char* format, const char* zeit);
+        DLLEXPORT int setClock(const char* format, const char* zeit);
         //! Sets the time.
         //! \param format A string that determines the format of the
         //! time in (zeit). h=hour, i=minute, s=second. \param
         //! zeit A Text object containing the new time. \return The
-        //! number of remaining days. Example: setUhrzeit( "h:i:s", new Text(
-        //! "05:30:00" ) ); Example: setUhrzeit( "h:i:s", new Text( "30:30:00"
+        //! number of remaining days. Example: setClock( "h:i:s", new Text(
+        //! "05:30:00" ) ); Example: setClock( "h:i:s", new Text( "30:30:00"
         //! ) ); return: 1, stored: 6:30:00
-        DLLEXPORT int setUhrzeit(const char* format, Text* zeit);
+        DLLEXPORT int setClock(const char* format, Text* zeit);
         //! Sets the hour.
         //! \param stunde The hour to be stored.
         //! \return The number of remaining days.
@@ -73,33 +73,33 @@ namespace Framework
         //! Calculates the sum of this and another time and stores the result.
         //! \param zeit The time whose values are to be added.
         //! \return The number of remaining days.
-        //! Example: Old time: 19:40:18, plusUhrzeit( (10:05:30) ); return 1,
+        //! Example: Old time: 19:40:18, plusClock( (10:05:30) ); return 1,
         //! stored time: 05:45:48
-        DLLEXPORT int plusUhrzeit(Uhrzeit* zeit);
+        DLLEXPORT int plusClock(Clock* zeit);
         //! Calculates the sum of this and another time and stores the result.
         //! \param stunde The hours to be added.
         //! \param minute The minutes to be added.
         //! \param sekunde The seconds to be added.
         //! \return The number of remaining days.
-        //! Example: Old time: 19:40:18, plusUhrzeit( 10, 5, 30 ); return 1,
+        //! Example: Old time: 19:40:18, plusClock( 10, 5, 30 ); return 1,
         //! stored time: 05:45:48
-        DLLEXPORT int plusUhrzeit(int stunde, int minute, int sekunde);
+        DLLEXPORT int plusClock(int stunde, int minute, int sekunde);
         //! Calculates the sum of this and another time and stores the result.
         //! \param format A string that determines the format of the
         //! time in (zeit). h=hour, i=minute, s=second.
         //! \param zeit A string containing the time to add.
         //! \return The number of remaining days.
-        //! Example: Old time: 19:40:18, plusUhrzeit( "h:i:s", "10:05:30" );
+        //! Example: Old time: 19:40:18, plusClock( "h:i:s", "10:05:30" );
         //! return 1, stored time: 05:45:48
-        DLLEXPORT int plusUhrzeit(const char* format, const char* zeit);
+        DLLEXPORT int plusClock(const char* format, const char* zeit);
         //! Calculates the sum of this and another time and stores the result.
         //! \param format A string that determines the format of the
         //! time in (zeit). h=hour, i=minute, s=second.
         //! \param zeit A Text object containing the time to add.
         //! \return The number of remaining days.
-        //! Example: Old time: 19:40:18, plusUhrzeit( "h:i:s", new Text(
+        //! Example: Old time: 19:40:18, plusClock( "h:i:s", new Text(
         //! "10:05:30" ) ); return 1, stored time: 05:45:48
-        DLLEXPORT int plusUhrzeit(const char* format, Text* zeit);
+        DLLEXPORT int plusClock(const char* format, Text* zeit);
         //! Calculates the sum of this and another time and stores the result.
         //! \param stunde The hours to add.
         //! \return The number of remaining days.
@@ -121,33 +121,33 @@ namespace Framework
         //! Subtracts a given time from this one and stores the result.
         //! \param zeit The time to subtract.
         //! \return The number of remaining days.
-        //! Example: Old time: 10:40:18, minusUhrzeit( (19:05:30) ); return -1,
+        //! Example: Old time: 10:40:18, minusClock( (19:05:30) ); return -1,
         //! stored time: 15:34:48
-        DLLEXPORT int minusUhrzeit(Uhrzeit* zeit);
+        DLLEXPORT int minusClock(Clock* zeit);
         //! Subtracts a given time from this one and stores the result.
         //! \param stunde The hours to subtract.
         //! \param minute The minutes to subtract.
         //! \param sekunde The seconds to subtract.
         //! \return The number of remaining days.
-        //! Example: Old time: 10:40:18, minusUhrzeit( 19, 05, 30 );
+        //! Example: Old time: 10:40:18, minusClock( 19, 05, 30 );
         //! return -1, stored time: 15:34:48
-        DLLEXPORT int minusUhrzeit(int stunde, int minute, int sekunde);
+        DLLEXPORT int minusClock(int stunde, int minute, int sekunde);
         //! Subtracts a given time from this one and stores the result.
         //! \param format A string that determines the format of the
         //! time in (zeit). h=hour, i=minute, s=second.
         //! \param zeit A string containing the time to subtract.
         //! \return The number of remaining days.
-        //! Example: Old time: 10:40:18, minusUhrzeit( "h:i:s", "19:05:30" );
+        //! Example: Old time: 10:40:18, minusClock( "h:i:s", "19:05:30" );
         //! return -1, stored time: 15:34:48
-        DLLEXPORT int minusUhrzeit(const char* format, const char* zeit);
+        DLLEXPORT int minusClock(const char* format, const char* zeit);
         //! Subtracts a given time from this one and stores the result.
         //! \param format A string that determines the format of the
         //! time in (zeit). h=hour, i=minute, s=second.
         //! \param zeit A Text object containing the time to subtract.
         //! \return The number of remaining days.
-        //! Example: Old time: 10:40:18, minusUhrzeit( "h:i:s", new Text(
+        //! Example: Old time: 10:40:18, minusClock( "h:i:s", new Text(
         //! "19:05:30" ) ); return -1, stored time: 15:34:48
-        DLLEXPORT int minusUhrzeit(const char* format, Text* zeit);
+        DLLEXPORT int minusClock(const char* format, Text* zeit);
         //! Subtracts a given time from this one and stores the result.
         //! \param stunde The hours to subtract.
         //! \return The number of remaining days.
@@ -176,13 +176,13 @@ namespace Framework
         //! Returns the time formatted as text.
         //! \param format A string that determines the format of the
         //! returned time. h=hour, i=minute, s=second.
-        //! Example: Time: 5:40:39, getUhrzeit( "h:i:s" ); return: "5:40:39"
-        DLLEXPORT Text* getUhrzeit(const char* format) const;
+        //! Example: Time: 5:40:39, getClock( "h:i:s" ); return: "5:40:39"
+        DLLEXPORT Text* getClock(const char* format) const;
         //! Checks if the time equals zeit.
         //! \param zeit The time to compare with.
         //! \return (true) if both times are equal. (false) if they
         //! are not equal.
-        DLLEXPORT bool istGleich(Uhrzeit* zeit) const;
+        DLLEXPORT bool istGleich(Clock* zeit) const;
         //! Checks if the time equals zeit.
         //! \param format A string that determines the format of the
         //! time in (zeit). h=hour, i=minute, s=second. \param
@@ -225,7 +225,7 @@ namespace Framework
         //! \return (true) if the stored time is less than the given
         //! time. (false) otherwise.
         //! Example: (5:30:00).istKleiner( (10:40:29) ); return true
-        DLLEXPORT bool istKleiner(Uhrzeit* zeit) const;
+        DLLEXPORT bool istKleiner(Clock* zeit) const;
         //! Checks if the time is less than the given time.
         //! \param stunde The hours of the time to check.
         //! \param minute The minutes of the time to check.
@@ -254,7 +254,7 @@ namespace Framework
         //! \return (true) if the stored time is greater than the given
         //! time. (false) otherwise.
         //! Example: (5:30:00).istLater( (10:40:29) ); return false
-        DLLEXPORT bool istLater(Uhrzeit* zeit) const;
+        DLLEXPORT bool istLater(Clock* zeit) const;
         //! Checks if the time is greater than the given time.
         //! \param stunde The hours of the time to check.
         //! \param minute The minutes of the time to check.
@@ -282,7 +282,7 @@ namespace Framework
     };
 
     //! This class stores a date in the form of year, month and day
-    class Datum : public virtual ReferenceCounter
+    class Date : public virtual ReferenceCounter
     {
     private:
         int jahr, monat, tag;
@@ -290,31 +290,31 @@ namespace Framework
         void update();
 
     public:
-        //! Creates a new Datum object with the default values 0.0.0.
-        DLLEXPORT Datum();
+        //! Creates a new Date object with the default values 0.0.0.
+        DLLEXPORT Date();
         //! Deletes the date.
-        DLLEXPORT ~Datum();
+        DLLEXPORT ~Date();
 
         //! Sets the date by copying.
         //! \param datum The date to store.
-        DLLEXPORT void setDatum(Datum* datum);
+        DLLEXPORT void setDate(Date* datum);
         //! Sets the date to the given values.
         //! \param jahr The year of the new date.
         //! \param monat The month of the new date.
         //! \param tag The day of the new date.
-        DLLEXPORT void setDatum(int jahr, int monat, int tag);
+        DLLEXPORT void setDate(int jahr, int monat, int tag);
         //! Sets the date to the given value.
         //! \param format A string specifying the format of the
         //! date in (datum). y=year, m=month, d=day. \param datum
         //! A string containing the new date.
-        //! Example: setDatum( "y-m-d", "2016-01-25" );
-        DLLEXPORT void setDatum(const char* format, const char* datum);
+        //! Example: setDate( "y-m-d", "2016-01-25" );
+        DLLEXPORT void setDate(const char* format, const char* datum);
         //! Sets the date to the given value.
         //! \param format A string specifying the format of the
         //! date in (datum). y=year, m=month, d=day. \param datum
         //! A Text object containing the new date.
-        //! Example: setDatum( "y-m-d", new Text( "2016-01-25" ) );
-        DLLEXPORT void setDatum(const char* format, Text* datum);
+        //! Example: setDate( "y-m-d", new Text( "2016-01-25" ) );
+        DLLEXPORT void setDate(const char* format, Text* datum);
         //! Changes the year of the date.
         //! \param jahr The new year.
         DLLEXPORT void setJahr(int jahr);
@@ -326,27 +326,27 @@ namespace Framework
         DLLEXPORT void setTag(int tag);
         //! Adds the given date to the current date and stores the result.
         //! \param datum The date to add.
-        //! Example: ( 1.11.1995 ).plusDatum( ( 5.2.7 ) ); new date: 6.1.2003
-        DLLEXPORT void plusDatum(Datum* datum);
+        //! Example: ( 1.11.1995 ).plusDate( ( 5.2.7 ) ); new date: 6.1.2003
+        DLLEXPORT void plusDate(Date* datum);
         //! Adds the given date to the current date and stores the result.
         //! \param jahr The year to add. \param monat The month to add.
         //! \param tag The day to add.
-        //! Example: ( 1.11.1995 ).plusDatum( 7, 2, 5 ); new date: 6.1.2003
-        DLLEXPORT void plusDatum(int jahr, int monat, int tag);
+        //! Example: ( 1.11.1995 ).plusDate( 7, 2, 5 ); new date: 6.1.2003
+        DLLEXPORT void plusDate(int jahr, int monat, int tag);
         //! Adds the given date to the current date and stores the result.
         //! \param format A string specifying the format of the
         //! date in (datum). y=year, m=month, d=day.
         //! \param datum A string containing the date to add.
-        //! Example: ( 1.11.1995 ).plusDatum( "d.m.y", "5.2.7" );
+        //! Example: ( 1.11.1995 ).plusDate( "d.m.y", "5.2.7" );
         //! new date: 6.1.2003
-        DLLEXPORT void plusDatum(const char* format, const char* datum);
+        DLLEXPORT void plusDate(const char* format, const char* datum);
         //! Adds the given date to the current date and stores the result.
         //! \param format A string specifying the format of the
         //! date in (datum). y=year, m=month, d=day.
         //! \param datum A Text object containing the date to add.
-        //! Example: ( 1.11.1995 ).plusDatum( "d.m.y", new Text(
+        //! Example: ( 1.11.1995 ).plusDate( "d.m.y", new Text(
         //! "5.2.7" ) ); new date: 6.1.2003
-        DLLEXPORT void plusDatum(const char* format, Text* datum);
+        DLLEXPORT void plusDate(const char* format, Text* datum);
         //! Adds the given year to the current date and stores the result.
         //! \param jahr The year to add.
         //! Example: ( 1.11.1995 ).plusJahr( 21 ); new date: 1.11.2016
@@ -361,27 +361,27 @@ namespace Framework
         DLLEXPORT void plusTag(int tag);
         //! Subtracts the given date from the current date and stores the result.
         //! \param datum The date to subtract.
-        //! Example: ( 2.12.1996 ).minusDatum( ( 1.1.1 ) ); new date: 1.11.1995
-        DLLEXPORT void minusDatum(Datum* datum);
+        //! Example: ( 2.12.1996 ).minusDate( ( 1.1.1 ) ); new date: 1.11.1995
+        DLLEXPORT void minusDate(Date* datum);
         //! Subtracts the given date from the current date and stores the result.
         //! \param jahr The year to subtract. \param monat The month to subtract.
         //! \param tag The day to subtract.
-        //! Example: ( 2.12.1996 ).minusDatum( 1, 1, 1 ); new date: 1.11.1995
-        DLLEXPORT void minusDatum(int jahr, int monat, int tag);
+        //! Example: ( 2.12.1996 ).minusDate( 1, 1, 1 ); new date: 1.11.1995
+        DLLEXPORT void minusDate(int jahr, int monat, int tag);
         //! Subtracts the given date from the current date and stores the result.
         //! \param format A string specifying the format of the
         //! date in (datum). y=year, m=month, d=day.
         //! \param datum A string containing the date to subtract.
-        //! Example: ( 2.12.1996 ).minusDatum( "d.m.y", "1.1.1" );
+        //! Example: ( 2.12.1996 ).minusDate( "d.m.y", "1.1.1" );
         //! new date: 1.11.1995
-        DLLEXPORT void minusDatum(const char* format, const char* datum);
+        DLLEXPORT void minusDate(const char* format, const char* datum);
         //! Subtracts the given date from the current date and stores the result.
         //! \param format A string specifying the format of the
         //! date in (datum). y=year, m=month, d=day.
         //! \param datum A Text object containing the date to subtract.
-        //! Example: ( 2.12.1996 ).minusDatum( "d.m.y", new Text(
+        //! Example: ( 2.12.1996 ).minusDate( "d.m.y", new Text(
         //! "1.1.1" ) ); new date: 1.11.1995
-        DLLEXPORT void minusDatum(const char* format, Text* datum);
+        DLLEXPORT void minusDate(const char* format, Text* datum);
         //! Subtracts the given year from the current date and stores the result.
         //! \param jahr The year to subtract.
         //! Example: ( 1.11.1996 ).minusJahr( 1 ); new date: 1.11.1995
@@ -404,13 +404,13 @@ namespace Framework
         //! Returns the date as a Text object.
         //! \param format A string specifying the format of the
         //! returned date. y=year, m=month, d=day.
-        //! Example: ( 1.11.1995 ).getDatum( "y-m-d" ); return: "1995-11-1"
-        DLLEXPORT Text* getDatum(const char* format) const;
+        //! Example: ( 1.11.1995 ).getDate( "y-m-d" ); return: "1995-11-1"
+        DLLEXPORT Text* getDate(const char* format) const;
         //! Checks if the date equals the given date.
         //! \param datum The date to check.
         //! \return (true) if the given date matches the stored one.
         //! (false) otherwise.
-        DLLEXPORT bool istGleich(Datum* datum) const;
+        DLLEXPORT bool istGleich(Date* datum) const;
         //! Checks if the date equals the given date.
         //! \param format A string specifying the format of the
         //! date in (datum). y=year, m=month, d=day. \param datum
@@ -455,7 +455,7 @@ namespace Framework
         //! \return (true) if the stored date is before the given one.
         //! (false) otherwise.
         //! Example: ( 1.11.1995 ).istKleiner( ( 23.1.2016 ) ); return true
-        DLLEXPORT bool istKleiner(Datum* datum) const;
+        DLLEXPORT bool istKleiner(Date* datum) const;
         //! Checks if the stored date is less than the given one.
         //! \param jahr The year of the date to check.
         //! \param monat The month of the date to check.
@@ -485,7 +485,7 @@ namespace Framework
         //! \return (true) if the stored date is after the given one.
         //! (false) otherwise.
         //! Example: ( 1.11.1995 ).istLater( ( 23.1.2016 ) ); return false
-        DLLEXPORT bool istLater(Datum* datum) const;
+        DLLEXPORT bool istLater(Date* datum) const;
         //! Checks if the stored date is greater than the given one.
         //! \param jahr The year of the date to check.
         //! \param monat The month of the date to check.
@@ -512,24 +512,24 @@ namespace Framework
         DLLEXPORT bool istLater(const char* format, Text* datum) const;
     };
 
-    //! This class combines the Datum and Uhrzeit classes and thus stores
+    //! This class combines the Date and Clock classes and thus stores
     //! a timestamp with year, month, day, hour, minute and second
-    class Zeit : public virtual ReferenceCounter
+    class Time : public virtual ReferenceCounter
     {
     private:
-        Datum* datum;
-        Uhrzeit* uhrzeit;
+        Date* datum;
+        Clock* uhrzeit;
 
     public:
-        //! Creates a new Zeit with the default values 0.0.0 0:0:0.
-        DLLEXPORT Zeit();
-        //! Creates a new Zeit with the elapsed seconds since 1970.
-        DLLEXPORT Zeit(__int64 timestamp);
+        //! Creates a new Time with the default values 0.0.0 0:0:0.
+        DLLEXPORT Time();
+        //! Creates a new Time with the elapsed seconds since 1970.
+        DLLEXPORT Time(__int64 timestamp);
         //! Deletes the current object.
-        DLLEXPORT ~Zeit();
+        DLLEXPORT ~Time();
         //! Changes the stored time by copying the values from (zeit).
         //! \param zeit The new time.
-        DLLEXPORT void setZeit(Zeit* zeit);
+        DLLEXPORT void setTime(Time* zeit);
         //! Changes the stored time.
         //! \param jahr The new year.
         //! \param monat The new month.
@@ -537,21 +537,21 @@ namespace Framework
         //! \param stunde The new hour.
         //! \param minute The new minute.
         //! \param sekunde The new second.
-        DLLEXPORT void setZeit(
+        DLLEXPORT void setTime(
             int jahr, int monat, int tag, int stunde, int minute, int sekunde);
         //! Changes the stored time.
         //! \param format A string specifying the format of the new
         //! time in (zeit). y=year, m=month, d=day, h=hour,
         //! i=minute, s=second. \param zeit A string containing the new
-        //! time. Example: setZeit( "y-m-d h:i:s", "2016-1-25 21:59:30" );
-        DLLEXPORT void setZeit(const char* format, const char* zeit);
+        //! time. Example: setTime( "y-m-d h:i:s", "2016-1-25 21:59:30" );
+        DLLEXPORT void setTime(const char* format, const char* zeit);
         //! Changes the stored time.
         //! \param format A string specifying the format of the new
         //! time in (zeit). y=year, m=month, d=day, h=hour,
         //! i=minute, s=second. \param zeit A Text object containing the
-        //! new time. Example: setZeit( "y-m-d h:i:s", new Text(
+        //! new time. Example: setTime( "y-m-d h:i:s", new Text(
         //! "2016-1-25 21:59:30" ) );
-        DLLEXPORT void setZeit(const char* format, Text* zeit);
+        DLLEXPORT void setTime(const char* format, Text* zeit);
         //! Changes the stored year.
         //! \param jahr The new year.
         DLLEXPORT void setJahr(int jahr);
@@ -572,7 +572,7 @@ namespace Framework
         DLLEXPORT void setSekunde(int sekunde);
         //! Adds the given time and stores the result.
         //! \param zeit The time to add.
-        DLLEXPORT void plusZeit(Zeit* zeit);
+        DLLEXPORT void plusTime(Time* zeit);
         //! Adds the given time and stores the result.
         //! \param jahr The year to add.
         //! \param monat The month to add.
@@ -580,20 +580,20 @@ namespace Framework
         //! \param stunde The hour to add.
         //! \param minute The minute to add.
         //! \param sekunde The second to add.
-        DLLEXPORT void plusZeit(
+        DLLEXPORT void plusTime(
             int jahr, int monat, int tag, int stunde, int minute, int sekunde);
         //! Adds the given time and stores the result.
         //! \param format A string specifying the format of the
         //! time in (zeit). y=year, m=month, d=day, h=hour,
         //! i=minute, s=second. \param zeit A string containing the
         //! time to add.
-        DLLEXPORT void plusZeit(const char* format, const char* zeit);
+        DLLEXPORT void plusTime(const char* format, const char* zeit);
         //! Adds the given time and stores the result.
         //! \param format A string specifying the format of the
         //! time in (zeit). y=year, m=month, d=day, h=hour,
         //! i=minute, s=second. \param zeit A Text object containing the
         //! time to add.
-        DLLEXPORT void plusZeit(const char* format, Text* zeit);
+        DLLEXPORT void plusTime(const char* format, Text* zeit);
         //! Adds the given time and stores the result.
         //! \param jahr The year to add.
         DLLEXPORT void plusJahr(int jahr);
@@ -614,7 +614,7 @@ namespace Framework
         DLLEXPORT void plusSekunde(__int64 sekunde);
         //! Subtracts the given time and stores the result.
         //! \param zeit The time to subtract.
-        DLLEXPORT void minusZeit(Zeit* zeit);
+        DLLEXPORT void minusTime(Time* zeit);
         //! Subtracts the given time and stores the result.
         //! \param jahr The year to subtract.
         //! \param monat The month to subtract.
@@ -622,20 +622,20 @@ namespace Framework
         //! \param stunde The hour to subtract.
         //! \param minute The minute to subtract.
         //! \param sekunde The second to subtract.
-        DLLEXPORT void minusZeit(
+        DLLEXPORT void minusTime(
             int jahr, int monat, int tag, int stunde, int minute, int sekunde);
         //! Subtracts the given time and stores the result.
         //! \param format A string specifying the format of the
         //! time in (zeit). y=year, m=month, d=day, h=hour,
         //! i=minute, s=second. \param zeit A string containing the
         //! time to subtract.
-        DLLEXPORT void minusZeit(const char* format, const char* zeit);
+        DLLEXPORT void minusTime(const char* format, const char* zeit);
         //! Subtracts the given time and stores the result.
         //! \param format A string specifying the format of the
         //! time in (zeit). y=year, m=month, d=day, h=hour,
         //! i=minute, s=second. \param zeit A Text object containing the
         //! time to subtract.
-        DLLEXPORT void minusZeit(const char* format, Text* zeit);
+        DLLEXPORT void minusTime(const char* format, Text* zeit);
         //! Subtracts the given time and stores the result.
         //! \param jahr The year to subtract.
         DLLEXPORT void minusJahr(int jahr);
@@ -658,11 +658,11 @@ namespace Framework
         //! \param format A string specifying the format of the
         //! returned time. y=year, m=month, d=day, h=hour,
         //! i=minute, s=second.
-        DLLEXPORT Text* getZeit(const char* format) const;
+        DLLEXPORT Text* getTime(const char* format) const;
         //! Checks if the time equals the given time.
         //! \param zeit The time to check.
         //! \return (true) if the times are equal. (false) otherwise.
-        DLLEXPORT bool istGleich(Zeit* zeit) const;
+        DLLEXPORT bool istGleich(Time* zeit) const;
         //! Checks if the time equals the given time.
         //! \param format A string specifying the format of the
         //! time in (zeit). y=year, m=month, d=day, h=hour,
@@ -692,18 +692,18 @@ namespace Framework
             int minute,
             int sekunde) const;
         //! Returns the object storing the date with increased reference counter.
-        DLLEXPORT Datum* getDatum() const;
+        DLLEXPORT Date* getDate() const;
         //! Returns the object storing the date without increased reference counter.
-        DLLEXPORT Datum* zDatum() const;
+        DLLEXPORT Date* zDate() const;
         //! Returns the object storing the time of day with increased reference counter.
-        DLLEXPORT Uhrzeit* getUhrzeit() const;
+        DLLEXPORT Clock* getClock() const;
         //! Returns the object storing the time of day without increased reference counter.
-        DLLEXPORT Uhrzeit* zUhrzeit() const;
+        DLLEXPORT Clock* zClock() const;
         //! Checks if the stored time is less than the given time.
         //! \param zeit The time to check. \return (true)
         //! if the stored time is before the given time. (false)
         //! otherwise.
-        DLLEXPORT bool istKleiner(Zeit* zeit) const;
+        DLLEXPORT bool istKleiner(Time* zeit) const;
         //! Checks if the stored time is less than the given time.
         //! \param jahr The year to check. \param monat The
         //! month to check. \param tag The day to check.
@@ -735,7 +735,7 @@ namespace Framework
         //! \param zeit The time to check. \return (true)
         //! if the stored time is after the given time. (false)
         //! otherwise.
-        DLLEXPORT bool istLater(Zeit* zeit) const;
+        DLLEXPORT bool istLater(Time* zeit) const;
         //! Checks if the stored time is greater than the given time.
         //! \param jahr The year to check. \param monat The
         //! month to check. \param tag The day to check.
@@ -765,9 +765,9 @@ namespace Framework
         DLLEXPORT bool istLater(const char* format, Text* zeit) const;
     };
 
-    //! Diese Klasse kann messen, wie viel Zeit zwischen zwei Zeitpunkten
+    //! Diese Class kann messen, wie viel Time zwischen zwei TimePoints
     //! verstrichen ist
-    class ZeitMesser : public virtual ReferenceCounter
+    class Timer : public virtual ReferenceCounter
     {
     private:
         double start;
@@ -775,10 +775,10 @@ namespace Framework
         double messung;
 
     public:
-        //! Creates a new ZeitMesser object
-        DLLEXPORT ZeitMesser();
+        //! Creates a new Timer object
+        DLLEXPORT Timer();
         //! Deletes the current object
-        DLLEXPORT ~ZeitMesser();
+        DLLEXPORT ~Timer();
         //! Sets the start point of the time measurement
         DLLEXPORT void messungStart();
         //! Sets the end point of the time measurement
@@ -797,11 +797,11 @@ namespace Framework
     };
 
     //! Returns the current time of day.
-    DLLEXPORT Uhrzeit* getUhrzeit();
+    DLLEXPORT Clock* getClock();
     //! Returns the current date.
-    DLLEXPORT Datum* getDatum();
+    DLLEXPORT Date* getDate();
     //! Returns the current time (date and time of day).
-    DLLEXPORT Zeit* getZeit();
+    DLLEXPORT Time* getTime();
     //! Checks whether jahr is a leap year.
     //! \param jahr The year to check.
     //! \return (true) if the given year is a leap year. (false) otherwise.

ToolTip.cpp

@@ -35,7 +35,7 @@ ToolTip::ToolTip(Screen* zScreen)
           | Style::Erlaubt;
     members = new RCArray<Drawable>();
     bildschirm->addToolTip(dynamic_cast<ToolTip*>(this->getThis()));
-    setMausEreignis(_ret1ME);
+    setMouseEvent(_ret1ME);
 }
 
 // Destructor
@@ -44,7 +44,7 @@ ToolTip::~ToolTip()
     members->release();
 }
 
-void ToolTip::doMausEreignis(MausEreignis& me, bool userRet)
+void ToolTip::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (!sichtbar) pos.x += me.mx, pos.y += me.my + 15;
     if (hatStyleNicht(Style::Sichtbar) || !me.insideParent || me.verarbeitet
@@ -70,8 +70,8 @@ void ToolTip::doMausEreignis(MausEreignis& me, bool userRet)
             me.mx += horizontalScrollBar->getScroll();
         if (me.id != ME_Betritt && me.id != ME_Leaves)
         {
-            for (int i = members->getEintragAnzahl() - 1; i >= 0; i--)
-                members->z(i)->doPublicMausEreignis(me);
+            for (int i = members->getEntryCount() - 1; i >= 0; i--)
+                members->z(i)->doPublicMouseEvent(me);
         }
         me.mx += rbr;
         me.my += rbr;
@@ -95,7 +95,7 @@ void ToolTip::doMausEreignis(MausEreignis& me, bool userRet)
         if (hatStyle(Style::HScroll) && horizontalScrollBar)
             me.mx += horizontalScrollBar->getScroll();
         for (auto z : *members)
-            z->doPublicMausEreignis(me);
+            z->doPublicMouseEvent(me);
         me.mx += rbr;
         me.my += rbr;
         if (hatStyle(Style::VScroll) && vertikalScrollBar)
@@ -305,7 +305,7 @@ Drawable* ToolTip::getMember(int i) const
 // Returns the number of drawings that belong to the tooltip
 int ToolTip::getMemberAnzahl() const
 {
-    return members->getEintragAnzahl();
+    return members->getEntryCount();
 }
 
 // Creates a complete copy of a tooltip

ToolTip.h

@@ -10,10 +10,10 @@ namespace Framework
 {
     class Font;       //! Font.h
     class Image;          //! Image.h
-    class AlphaFeld;     //! AlphaField.h
+    class AlphaField;     //! AlphaField.h
     class Text;          //! Text.h
     class Border;        //! Border.h
-    struct MausEreignis; //! MouseEvent.h
+    struct MouseEvent; //! MouseEvent.h
     class Screen;    //! Screen.h
 
 #ifdef WIN32
@@ -38,7 +38,7 @@ namespace Framework
         std::function<void(ToolTip*)> onHide;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor

Tree.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "Array.h"
 
@@ -111,7 +111,7 @@ namespace Framework
 
         bool hasNext()
         {
-            if (current->subtrees->getEintragAnzahl() >= nextSub) return 1;
+            if (current->subtrees->getEntryCount() >= nextSub) return 1;
             Tree<T>* c = current;
             while (true)
             {
@@ -139,7 +139,7 @@ namespace Framework
 
         TreeIterator<T> next()
         {
-            if (current->subtrees->getEintragAnzahl() >= nextSub)
+            if (current->subtrees->getEntryCount() >= nextSub)
                 return TreeIterator(current->subtrees->z(nextSub++));
             Tree<T>* c = current;
             while (true)

TriangleList.h

@@ -1,5 +1,5 @@
-#ifndef DreieckListe_H
-#define DreieckListe_H
+#ifndef TriangleList_H
+#define TriangleList_H
 
 #include "Array.h"
 #include "Point.h"
@@ -8,7 +8,7 @@ namespace Framework
 {
     template<typename T>
     //! A corner of a triangle
-    struct DreieckPunkt
+    struct TriangleVertex
     {
         T* punkt;
         Vec2<float>* textur;
@@ -16,14 +16,14 @@ namespace Framework
         //! Constructor
         //! \param punkt The coordinate of the corner
         //! \param textur The coordinate in the texture
-        DreieckPunkt(T* punkt, Vec2<float>* textur)
+        TriangleVertex(T* punkt, Vec2<float>* textur)
         {
             this->punkt = punkt;
             this->textur = textur;
         }
 
         //! Destructor
-        ~DreieckPunkt()
+        ~TriangleVertex()
         {
             delete punkt;
             delete textur;
@@ -33,23 +33,23 @@ namespace Framework
     template<typename T>
     //! A list of triangles where the last two points of the previous triangle
     //! together with the next point form a new triangle
-    class DreieckListe : public virtual ReferenceCounter
+    class TriangleList : public virtual ReferenceCounter
     {
     private:
-        Array<DreieckPunkt<T>*>* punkte;
+        Array<TriangleVertex<T>*>* punkte;
 
     public:
         //! Constructor
-        DreieckListe()
+        TriangleList()
             : ReferenceCounter()
         {
-            punkte = new Array<DreieckPunkt<T>*>();
+            punkte = new Array<TriangleVertex<T>*>();
         }
 
         //! Destructor
-        ~DreieckListe()
+        ~TriangleList()
         {
-            int anz = punkte->getEintragAnzahl();
+            int anz = punkte->getEntryCount();
             for (int i = 0; i < anz; i++)
                 delete punkte->get(i);
             punkte->release();
@@ -60,13 +60,13 @@ namespace Framework
         //! \param textur The coordinates in the texture
         void addPunkt(T* p, Vec2<float>* textur)
         {
-            punkte->add(new DreieckPunkt<T>(p, textur));
+            punkte->add(new TriangleVertex<T>(p, textur));
         }
 
         //! Deletes the last point
         void removeLetztenPunkt()
         {
-            int i = punkte->getEintragAnzahl() - 1;
+            int i = punkte->getEntryCount() - 1;
             if (!punkte->hat(i)) return;
             delete punkte->get(i);
             punkte->remove(i);
@@ -75,7 +75,7 @@ namespace Framework
         //! Deletes all corners
         void lehren()
         {
-            int anz = punkte->getEintragAnzahl();
+            int anz = punkte->getEntryCount();
             for (int i = 0; i < anz; i++)
                 delete punkte->get(i);
             punkte->leeren();
@@ -84,13 +84,13 @@ namespace Framework
         //! Returns the number of triangles
         int getDreieckAnzahl() const
         {
-            return punkte->getEintragAnzahl() - 2;
+            return punkte->getEntryCount() - 2;
         }
 
         //! Returns whether a texture is used
-        bool hatTextur() const
+        bool hasTexture() const
         {
-            int anz = punkte->getEintragAnzahl();
+            int anz = punkte->getEntryCount();
             bool ret = 1;
             for (int i = 0; i < anz; i++)
             {
@@ -100,7 +100,7 @@ namespace Framework
         }
 
         //! Returns the list of points
-        Array<DreieckPunkt<T>*>* zListe() const
+        Array<TriangleVertex<T>*>* zListe() const
         {
             return punkte;
         }

Type.h

@@ -4,7 +4,7 @@
 
 namespace Framework
 {
-    class Typ
+    class Type
     {
     protected:
         Text name;

UIDialog.cpp

@@ -16,8 +16,8 @@ UIDialog::UIDialog(Font* schrift)
     setKBgFarbe(0xFF000000);
     setTBgFarbe(0xFF000000);
     setSBgFarbe(0xFF000000);
-    setMausEreignis(_ret1ME);
-    setTastaturEreignis(_ret1TE);
+    setMouseEvent(_ret1ME);
+    setKeyboardEvent(_ret1TE);
     setRBreite(1);
     setRFarbe(0xFFFFFFFF);
     setTitel("");
@@ -32,7 +32,7 @@ UIDialog::UIDialog(Font* schrift)
     setTAfStrength(-15);
     setSKAfFarbe(0xFF00FF00);
     setSKAfStrength(30);
-    setClosingMe([this](void* p, void* o, MausEreignis me) {
+    setClosingMe([this](void* p, void* o, MouseEvent me) {
         if (me.id == ME_RLinks) removeStyle(Window::Style::Sichtbar);
         return 1;
     });
@@ -97,9 +97,9 @@ UIMessageDialog::UIMessageDialog(
     int br = tr.getTextBreite(message);
     int hoe = tr.getTextHeight(message);
     msg->setSize(br, hoe);
-    Knopf* ok = init.createKnopf(init.initParam);
+    Button* ok = init.createButton(init.initParam);
     ok->setText("Ok");
-    ok->setMausEreignis([this](void* p, void* o, MausEreignis me) {
+    ok->setMouseEvent([this](void* p, void* o, MouseEvent me) {
         if (me.id == ME_RLinks) removeStyle(Window::Style::Sichtbar);
         return 1;
     });

UIInitialization.cpp

@@ -18,12 +18,12 @@
 
 using namespace Framework;
 
-AuswahlBox* createAuswahlBox(const UIInitParam& p)
+SelectionBox* createSelectionBox(const UIInitParam& p)
 {
-    AuswahlBox* ret = new AuswahlBox();
-    ret->setStyle(AuswahlBox::Style::Normal);
+    SelectionBox* ret = new SelectionBox();
+    ret->setStyle(SelectionBox::Style::Normal);
     ret->setHintergrundFarbe(0xFF000000);
-    ret->setMausEreignis(_ret1ME);
+    ret->setMouseEvent(_ret1ME);
     if (p.schrift)
         ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setBorderWidth(1);
@@ -31,27 +31,27 @@ AuswahlBox* createAuswahlBox(const UIInitParam& p)
     ret->setMaxAuskappHeight(100);
     ret->setMausRahmenBreite(1);
     ret->setMausRahmenFarbe(0xFF005500);
-    ret->setMausAlphaFeldFarbe(0x00008700);
+    ret->setMouseAlphaFieldColor(0x00008700);
     ret->setMausAlphaFeldStrength(-8);
     ret->setAuswRahmenBreite(1);
     ret->setAuswRahmenFarbe(0xFF00FF00);
-    ret->setAuswAlphaFeldFarbe(0x0000FF00);
+    ret->setSelAlphaFieldColor(0x0000FF00);
     ret->setAuswAlphaFeldStrength(-8);
     return ret;
 }
 
-AuswahlListe* createAuswahlListe(const UIInitParam& p)
+SelectionList* createSelectionList(const UIInitParam& p)
 {
-    AuswahlListe* ret = new AuswahlListe();
-    ret->setStyle(AuswahlListe::Style::Normal);
+    SelectionList* ret = new SelectionList();
+    ret->setStyle(SelectionList::Style::Normal);
     if (p.schrift)
         ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
-    ret->setAlphaFeldFarbe(0x5500FF00);
-    ret->setAlphaFeldStrength(-5);
+    ret->setAlphaFieldColor(0x5500FF00);
+    ret->setAlphaFieldStrength(-5);
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
     ret->setHintergrundFarbe(0xFF000000);
-    ret->setMausEreignis(_ret1ME);
+    ret->setMouseEvent(_ret1ME);
     ret->setALRBreite(1);
     ret->setALRFarbe(0xFF00FF00);
     ret->setAAFFarbe(0x0000FF00);
@@ -69,10 +69,10 @@ ImageView* createImageView(const UIInitParam& p)
     return ret;
 }
 
-FBalken* createFBalken(const UIInitParam& p)
+ProgressBar* createProgressBar(const UIInitParam& p)
 {
-    FBalken* ret = new FBalken();
-    ret->setStyle(FBalken::Style::normal);
+    ProgressBar* ret = new ProgressBar();
+    ret->setStyle(ProgressBar::Style::normal);
     if (p.schrift)
         ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setSFarbe(0xFFFFFFFF);
@@ -80,8 +80,8 @@ FBalken* createFBalken(const UIInitParam& p)
     ret->setBorderColor(0xFFFFFFFF);
     ret->setBorderWidth(1);
 #ifdef WIN32
-    LTDBDatei* datei = new LTDBDatei();
-    datei->setDatei(new Text(
+    LTDBFile* datei = new LTDBFile();
+    datei->setFile(new Text(
         "data/bilder/system.ltdb")); // TODO integrate this into the dll
     datei->leseDaten(0);
     Image* fbhb = datei->laden(0, new Text("fortschrittleh"));
@@ -94,9 +94,9 @@ FBalken* createFBalken(const UIInitParam& p)
     return ret;
 }
 
-Kamera2D* createKamera2D(const UIInitParam& p)
+Camera2D* createCamera2D(const UIInitParam& p)
 {
-    Kamera2D* ret = new Kamera2D();
+    Camera2D* ret = new Camera2D();
     // TODO
     return ret;
 }
@@ -104,8 +104,8 @@ Kamera2D* createKamera2D(const UIInitParam& p)
 Window* createWindow(const UIInitParam& p)
 {
     Window* ret = new Window();
-    ret->setMausEreignis(_ret1ME);
-    ret->setTastaturEreignis(_ret1TE);
+    ret->setMouseEvent(_ret1ME);
+    ret->setKeyboardEvent(_ret1TE);
     ret->setStyle(Window::Style::normal);
     ret->setRBreite(1);
     ret->setRFarbe(0xFFFFFFFF);
@@ -126,26 +126,26 @@ Window* createWindow(const UIInitParam& p)
     return ret;
 }
 
-Knopf* createKnopf(const UIInitParam& p)
+Button* createButton(const UIInitParam& p)
 {
-    Knopf* ret = new Knopf();
+    Button* ret = new Button();
     if (p.schrift)
         ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
-    ret->setStyle(Knopf::Style::Normal);
+    ret->setStyle(Button::Style::Normal);
     return ret;
 }
 
-KontrollKnopf* createKontrollKnopf(const UIInitParam& p)
+CheckBox* createCheckBox(const UIInitParam& p)
 {
-    KontrollKnopf* ret = new KontrollKnopf();
-    ret->setMausEreignis(_ret1ME);
-    ret->setStyle(KontrollKnopf::Style::Normal);
+    CheckBox* ret = new CheckBox();
+    ret->setMouseEvent(_ret1ME);
+    ret->setStyle(CheckBox::Style::Normal);
     if (p.schrift)
         ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setSFarbe(0xFFFFFFFF);
     ret->setSSize(12);
-    ret->setAlphaFeldFarbe(0x5500FF00);
-    ret->setAlphaFeldStrength(-5);
+    ret->setAlphaFieldColor(0x5500FF00);
+    ret->setAlphaFieldStrength(-5);
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFF00FF00);
 #ifdef WIN32
@@ -155,10 +155,10 @@ KontrollKnopf* createKontrollKnopf(const UIInitParam& p)
     return ret;
 }
 
-LDiag* createLDiag(const UIInitParam& p)
+BarDiagram* createBarDiagram(const UIInitParam& p)
 {
-    LDiag* ret = new LDiag();
-    ret->setStyle(LDiag::Style::normal);
+    BarDiagram* ret = new BarDiagram();
+    ret->setStyle(BarDiagram::Style::normal);
     if (p.schrift)
         ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setBorderWidth(1);
@@ -170,9 +170,9 @@ LDiag* createLDiag(const UIInitParam& p)
     return ret;
 }
 
-M2DVorschau* createM2DVorschau(const UIInitParam& p)
+M2DPreview* createM2DPreview(const UIInitParam& p)
 {
-    M2DVorschau* ret = new M2DVorschau();
+    M2DPreview* ret = new M2DPreview();
     // TODO
     return ret;
 }
@@ -199,18 +199,18 @@ TextField* createTextField(const UIInitParam& p)
         ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setSchriftFarbe(0xFFFFFFFF);
     ret->setSchriftSize(12);
-    ret->setAlphaFeldFarbe(0x5500FF00);
-    ret->setAlphaFeldStrength(-5);
+    ret->setAlphaFieldColor(0x5500FF00);
+    ret->setAlphaFieldStrength(-5);
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFF00FF00);
     return ret;
 }
 
-ObjTabelle* createObjTabelle(const UIInitParam& p)
+ObjTable* createObjTable(const UIInitParam& p)
 {
-    ObjTabelle* ret = new ObjTabelle();
-    ret->setStyle(ObjTabelle::Style::normal);
-    ret->setMausEreignis(_ret1ME);
+    ObjTable* ret = new ObjTable();
+    ret->setStyle(ObjTable::Style::normal);
+    ret->setMouseEvent(_ret1ME);
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
     ret->setRasterBreite(1);
@@ -220,9 +220,9 @@ ObjTabelle* createObjTabelle(const UIInitParam& p)
     return ret;
 }
 
-SLDiag* createSLDiag(const UIInitParam& p)
+LineDiagram* createLineDiagram(const UIInitParam& p)
 {
-    SLDiag* ret = new SLDiag();
+    LineDiagram* ret = new LineDiagram();
     // TODO
     return ret;
 }
@@ -240,21 +240,21 @@ UIInit Framework::defaultUI(Font* zFont, Screen* zScreen)
     uii.initParam.schrift = zFont;
     uii.initParam.bildschirm = zScreen;
     uii.initParam.data = 0;
-    uii.createAuswahlBox = createAuswahlBox;
-    uii.createAuswahlListe = createAuswahlListe;
+    uii.createSelectionBox = createSelectionBox;
+    uii.createSelectionList = createSelectionList;
     uii.createImageView = createImageView;
-    uii.createFBalken = createFBalken;
-    uii.createKamera2D = createKamera2D;
+    uii.createProgressBar = createProgressBar;
+    uii.createCamera2D = createCamera2D;
     uii.createWindow = createWindow;
-    uii.createKnopf = createKnopf;
-    uii.createKontrollKnopf = createKontrollKnopf;
-    uii.createLDiag = createLDiag;
-    uii.createM2DVorschau = createM2DVorschau;
+    uii.createButton = createButton;
+    uii.createCheckBox = createCheckBox;
+    uii.createBarDiagram = createBarDiagram;
+    uii.createM2DPreview = createM2DPreview;
     uii.createModel2D = createModel2D;
     uii.createAnimation2D = createAnimation2D;
     uii.createTextField = createTextField;
-    uii.createObjTabelle = createObjTabelle;
-    uii.createSLDiag = createSLDiag;
+    uii.createObjTable = createObjTable;
+    uii.createLineDiagram = createLineDiagram;
     uii.createUIMLView = createUIMLView;
     return uii;
 }

UIInitialization.h

@@ -6,21 +6,21 @@
 
 namespace Framework
 {
-    class AuswahlBox;
-    class AuswahlListe;
+    class SelectionBox;
+    class SelectionList;
     class ImageView;
-    class FBalken;
-    class Kamera2D;
+    class ProgressBar;
+    class Camera2D;
     class Window;
-    class Knopf;
-    class KontrollKnopf;
-    class LDiag;
-    class M2DVorschau;
+    class Button;
+    class CheckBox;
+    class BarDiagram;
+    class M2DPreview;
     class Model2D;
     class Animation2D;
     class TextField;
-    class ObjTabelle;
-    class SLDiag;
+    class ObjTable;
+    class LineDiagram;
     class UIMLView;
     class Font;
     class Screen;
@@ -35,21 +35,21 @@ namespace Framework
     struct UIInit
     {
         UIInitParam initParam;
-        std::function<AuswahlBox*(const UIInitParam& p)> createAuswahlBox;
-        std::function<AuswahlListe*(const UIInitParam& p)> createAuswahlListe;
+        std::function<SelectionBox*(const UIInitParam& p)> createSelectionBox;
+        std::function<SelectionList*(const UIInitParam& p)> createSelectionList;
         std::function<ImageView*(const UIInitParam& p)> createImageView;
-        std::function<FBalken*(const UIInitParam& p)> createFBalken;
-        std::function<Kamera2D*(const UIInitParam& p)> createKamera2D;
+        std::function<ProgressBar*(const UIInitParam& p)> createProgressBar;
+        std::function<Camera2D*(const UIInitParam& p)> createCamera2D;
         std::function<Window*(const UIInitParam& p)> createWindow;
-        std::function<Knopf*(const UIInitParam& p)> createKnopf;
-        std::function<KontrollKnopf*(const UIInitParam& p)> createKontrollKnopf;
-        std::function<LDiag*(const UIInitParam& p)> createLDiag;
-        std::function<M2DVorschau*(const UIInitParam& p)> createM2DVorschau;
+        std::function<Button*(const UIInitParam& p)> createButton;
+        std::function<CheckBox*(const UIInitParam& p)> createCheckBox;
+        std::function<BarDiagram*(const UIInitParam& p)> createBarDiagram;
+        std::function<M2DPreview*(const UIInitParam& p)> createM2DPreview;
         std::function<Model2D*(const UIInitParam& p)> createModel2D;
         std::function<Animation2D*(const UIInitParam& p)> createAnimation2D;
         std::function<TextField*(const UIInitParam& p)> createTextField;
-        std::function<ObjTabelle*(const UIInitParam& p)> createObjTabelle;
-        std::function<SLDiag*(const UIInitParam& p)> createSLDiag;
+        std::function<ObjTable*(const UIInitParam& p)> createObjTable;
+        std::function<LineDiagram*(const UIInitParam& p)> createLineDiagram;
         std::function<UIMLView*(const UIInitParam& p)> createUIMLView;
     };
 

UIMLView.cpp

@@ -488,7 +488,7 @@ bool UIMLButton::isApplicableFor(XML::Element& element)
 Drawable* UIMLButton::parseElement(
     XML::Element& element, UIMLContainer& generalFactory)
 {
-    Knopf* k = generalFactory.getFactory().createKnopf(
+    Button* k = generalFactory.getFactory().createButton(
         generalFactory.getFactory().initParam);
     updateElement(element, *k, generalFactory);
     return k;
@@ -497,11 +497,11 @@ Drawable* UIMLButton::parseElement(
 bool Framework::UIMLButton::updateElement(
     XML::Element& element, Drawable& z, UIMLContainer& generalFactory)
 {
-    Knopf* k = dynamic_cast<Knopf*>(&z);
+    Button* k = dynamic_cast<Button*>(&z);
     if (!k) return false;
     if (!element.hasAttribute("style"))
     {
-        Knopf* tmp = generalFactory.getFactory().createKnopf(
+        Button* tmp = generalFactory.getFactory().createButton(
             generalFactory.getFactory().initParam);
         k->setStyle(tmp->getStyles());
         tmp->release();
@@ -516,10 +516,10 @@ void UIMLButton::layout(XML::Element& element,
     UIMLContainer& generalLayouter)
 {
     if (element.hasAttribute("font-size"))
-        ((Knopf*)&z)
+        ((Button*)&z)
             ->setSchriftSize(
                 (unsigned char)(int)element.getAttributeValue("font-size"));
-    ((Knopf*)&z)->setText(element.getText());
+    ((Button*)&z)->setText(element.getText());
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
 }
 
@@ -535,7 +535,7 @@ bool UIMLCheck::isApplicableFor(XML::Element& element)
 Drawable* UIMLCheck::parseElement(
     XML::Element& element, UIMLContainer& generalFactory)
 {
-    KontrollKnopf* k = generalFactory.getFactory().createKontrollKnopf(
+    CheckBox* k = generalFactory.getFactory().createCheckBox(
         generalFactory.getFactory().initParam);
     updateElement(element, *k, generalFactory);
     return k;
@@ -544,11 +544,11 @@ Drawable* UIMLCheck::parseElement(
 bool Framework::UIMLCheck::updateElement(
     XML::Element& element, Drawable& z, UIMLContainer& generalFactory)
 {
-    KontrollKnopf* k = dynamic_cast<KontrollKnopf*>(&z);
+    CheckBox* k = dynamic_cast<CheckBox*>(&z);
     if (!k) return false;
     if (!element.hasAttribute("style"))
     {
-        KontrollKnopf* tmp = generalFactory.getFactory().createKontrollKnopf(
+        CheckBox* tmp = generalFactory.getFactory().createCheckBox(
             generalFactory.getFactory().initParam);
         k->setStyle(tmp->getStyles());
         tmp->release();
@@ -562,12 +562,12 @@ void UIMLCheck::layout(XML::Element& element,
     int pHeight,
     UIMLContainer& generalLayouter)
 {
-    ((KontrollKnopf*)&z)->setText(element.getText());
-    ((KontrollKnopf*)&z)->setSText(element.getText());
+    ((CheckBox*)&z)->setText(element.getText());
+    ((CheckBox*)&z)->setSText(element.getText());
     z.setStyle(
-        KontrollKnopf::Style::Selected, element.hasAttribute("selected"));
+        CheckBox::Style::Selected, element.hasAttribute("selected"));
     if (element.hasAttribute("font-size"))
-        ((KontrollKnopf*)&z)
+        ((CheckBox*)&z)
             ->setSSize(
                 (unsigned char)(int)element.getAttributeValue("font-size"));
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
@@ -777,7 +777,7 @@ bool UIMLTable::isApplicableFor(XML::Element& element)
 Drawable* UIMLTable::parseElement(
     XML::Element& element, UIMLContainer& generalFactory)
 {
-    ObjTabelle* t = generalFactory.getFactory().createObjTabelle(
+    ObjTable* t = generalFactory.getFactory().createObjTable(
         generalFactory.getFactory().initParam);
     updateElement(element, *t, generalFactory);
     return t;
@@ -786,7 +786,7 @@ Drawable* UIMLTable::parseElement(
 DLLEXPORT bool Framework::UIMLTable::updateElement(
     XML::Element& element, Drawable& z, UIMLContainer& generalFactory)
 {
-    ObjTabelle* t = dynamic_cast<ObjTabelle*>(&z);
+    ObjTable* t = dynamic_cast<ObjTable*>(&z);
     if (!t) return false;
     int index = 0;
     int linePos = 0;
@@ -848,7 +848,7 @@ DLLEXPORT bool Framework::UIMLTable::updateElement(
     }
     if (!element.hasAttribute("style"))
     {
-        ObjTabelle* tmp = generalFactory.getFactory().createObjTabelle(
+        ObjTable* tmp = generalFactory.getFactory().createObjTable(
             generalFactory.getFactory().initParam);
         t->setStyle(tmp->getStyles());
         tmp->release();
@@ -864,15 +864,15 @@ void UIMLTable::layout(XML::Element& element,
 {
     if (element.hasAttribute("scroll"))
     {
-        z.setStyle(ObjTabelle::Style::HScroll,
+        z.setStyle(ObjTable::Style::HScroll,
             element.getAttributeValue("scroll").istGleich("horizontal"));
-        z.setStyle(ObjTabelle::Style::VScroll,
+        z.setStyle(ObjTable::Style::VScroll,
             element.getAttributeValue("scroll").istGleich("vertical"));
-        z.setStyle(ObjTabelle::Style::scroll,
+        z.setStyle(ObjTable::Style::scroll,
             element.getAttributeValue("scroll").istGleich("both"));
     }
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
-    ObjTabelle* objT = (ObjTabelle*)&z;
+    ObjTable* objT = (ObjTable*)&z;
     if (objT->getZeilenAnzahl() > 0)
     {
         if (element.hasAttribute("line-height"))
@@ -1116,7 +1116,7 @@ UIMLView::~UIMLView()
 
 // Processes a mouse event. Called automatically by the framework.
 //  me: The event
-void UIMLView::doMausEreignis(MausEreignis& me, bool userRet)
+void UIMLView::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (dom)
     {
@@ -1141,7 +1141,7 @@ void UIMLView::doMausEreignis(MausEreignis& me, bool userRet)
             { // TODO render elements backwards
                 Drawable* z = members->z(i->getAttributeValue("id"),
                     i->getAttributeValue("id").getLength());
-                if (z) z->doPublicMausEreignis(me);
+                if (z) z->doPublicMouseEvent(me);
             }
         }
         me.mx += rbr;
@@ -1161,14 +1161,14 @@ void UIMLView::doMausEreignis(MausEreignis& me, bool userRet)
 }
 
 void Framework::UIMLView::setOnMemberMouseEvent(std::function<bool(
-        XML::Element& element, Drawable& member, MausEreignis me)>
+        XML::Element& element, Drawable& member, MouseEvent me)>
         onEventAction)
 {
     onMemberMouseEvent = onEventAction;
 }
 
 void Framework::UIMLView::setOnMemberKeyboardEvent(std::function<bool(
-        XML::Element& element, Drawable& member, TastaturEreignis te)>
+        XML::Element& element, Drawable& member, KeyboardEvent te)>
         onEventAction)
 {
     onMemberKeyboardEvent = onEventAction;
@@ -1344,10 +1344,10 @@ void UIMLView::removeMember(Text id)
 
 // Processes a keyboard event. Called automatically by the framework
 //  te: The event
-void UIMLView::doTastaturEreignis(TastaturEreignis& te)
+void UIMLView::doKeyboardEvent(KeyboardEvent& te)
 {
     bool verarbeitet = te.verarbeitet;
-    DrawableBackground::doTastaturEreignis(te);
+    DrawableBackground::doKeyboardEvent(te);
     te.verarbeitet = verarbeitet;
     if (dom)
     {
@@ -1355,7 +1355,7 @@ void UIMLView::doTastaturEreignis(TastaturEreignis& te)
         { // TODO render elements backwards
             Drawable* z = members->z(i->getAttributeValue("id"),
                 i->getAttributeValue("id").getLength());
-            if (z) z->doTastaturEreignis(te);
+            if (z) z->doKeyboardEvent(te);
         }
     }
 }
@@ -1512,8 +1512,8 @@ Drawable* UIMLView::parseElement(
         {
             if (hatStyle(Style::GlobalMouseEvent))
             {
-                z->addMausEreignis(
-                    [this, z](void* p, void* o, MausEreignis me) {
+                z->addMouseEvent(
+                    [this, z](void* p, void* o, MouseEvent me) {
                         return dom->selectChildren()
                             .selectAllElements()
                             .whereAttributeEquals("id", getDrawableId(*z))
@@ -1529,8 +1529,8 @@ Drawable* UIMLView::parseElement(
             }
             if (hatStyle(Style::GlobalTastaturEvent))
             {
-                z->addTastaturEreignis(
-                    [this, z](void* p, void* o, TastaturEreignis te) {
+                z->addKeyboardEvent(
+                    [this, z](void* p, void* o, KeyboardEvent te) {
                         return dom->selectChildren()
                             .selectAllElements()
                             .whereAttributeEquals("id", getDrawableId(*z))

UIMLView.h

@@ -9,7 +9,7 @@
 namespace Framework
 {
     class Text;
-    class ObjTabelle;
+    class ObjTable;
     class Font;
     class Screen;
     class UIMLContainer;
@@ -474,16 +474,16 @@ namespace Framework
         XML::Element* dom;
         int nextId;
         std::function<bool(
-            XML::Element& element, Drawable& member, MausEreignis me)>
+            XML::Element& element, Drawable& member, MouseEvent me)>
             onMemberMouseEvent;
         std::function<bool(
-            XML::Element& element, Drawable& member, TastaturEreignis te)>
+            XML::Element& element, Drawable& member, KeyboardEvent te)>
             onMemberKeyboardEvent;
 
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The event
-        DLLEXPORT virtual void doMausEreignis(
-            MausEreignis& me, bool userRet) override;
+        DLLEXPORT virtual void doMouseEvent(
+            MouseEvent& me, bool userRet) override;
 
     public:
         //! Creates a UIML View
@@ -505,7 +505,7 @@ namespace Framework
         /// <param name="onEventAction">the function to execute if a mouse event
         /// occures</param>
         DLLEXPORT void setOnMemberMouseEvent(std::function<bool(
-                XML::Element& element, Drawable& member, MausEreignis me)>
+                XML::Element& element, Drawable& member, MouseEvent me)>
                 onEventAction);
         /// <summary>
         /// sets a function that is executed if a mouse event on a member view
@@ -515,7 +515,7 @@ namespace Framework
         /// <param name="onEventAction">the function to execute if a mouse event
         /// occures</param>
         DLLEXPORT void setOnMemberKeyboardEvent(std::function<bool(
-                XML::Element& element, Drawable& member, TastaturEreignis te)>
+                XML::Element& element, Drawable& member, KeyboardEvent te)>
                 onEventAction);
         //! Removes all known elements that can be used in uiml
         DLLEXPORT void removeAllKnownElements();
@@ -555,7 +555,7 @@ namespace Framework
         DLLEXPORT Drawable* getDrawableById(const char* id) override;
         //! Processes a keyboard event. Called automatically by the framework
         //! \param te The event
-        DLLEXPORT virtual void doTastaturEreignis(TastaturEreignis& te);
+        DLLEXPORT virtual void doKeyboardEvent(KeyboardEvent& te);
         //! Updates the drawing background
         //! \param tickVal The elapsed time in seconds since the last call
         //! of this function \return 1 if the image needs to be redrawn. 0 otherwise

Window.cpp

@@ -65,7 +65,7 @@ LRESULT CALLBACK Framework::WindowProc(
     switch (message)
     {
     case WM_SETCURSOR: // Mouse cursor
-        MausZeiger.update();
+        mousePointer.update();
         return 0;
     case WM_SIZE: // Window
         if (wparam == SIZE_RESTORED) nativeWindows.sendRestoreMessage(hwnd);
@@ -79,7 +79,7 @@ LRESULT CALLBACK Framework::WindowProc(
     case WM_LBUTTONDOWN: // Left click
         {
             MausStand[M_Links] = 1;
-            MausEreignis me = {ME_PLinks,
+            MouseEvent me = {ME_PLinks,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -92,7 +92,7 @@ LRESULT CALLBACK Framework::WindowProc(
     case WM_RBUTTONDOWN: // Right click
         {
             MausStand[M_Rechts] = 1;
-            MausEreignis me = {ME_PRechts,
+            MouseEvent me = {ME_PRechts,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -105,7 +105,7 @@ LRESULT CALLBACK Framework::WindowProc(
     case WM_MBUTTONDOWN: // Middle click
         {
             MausStand[M_Mitte] = 1;
-            MausEreignis me = {ME_PMitte,
+            MouseEvent me = {ME_PMitte,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -118,7 +118,7 @@ LRESULT CALLBACK Framework::WindowProc(
     case WM_LBUTTONUP: // Left release
         {
             MausStand[M_Links] = 0;
-            MausEreignis me = {ME_RLinks,
+            MouseEvent me = {ME_RLinks,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -131,7 +131,7 @@ LRESULT CALLBACK Framework::WindowProc(
     case WM_RBUTTONUP: // Right release
         {
             MausStand[M_Rechts] = 0;
-            MausEreignis me = {ME_RRechts,
+            MouseEvent me = {ME_RRechts,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -144,7 +144,7 @@ LRESULT CALLBACK Framework::WindowProc(
     case WM_MBUTTONUP: // Middle release
         {
             MausStand[M_Mitte] = 0;
-            MausEreignis me = {ME_RMitte,
+            MouseEvent me = {ME_RMitte,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -156,7 +156,7 @@ LRESULT CALLBACK Framework::WindowProc(
         }
     case WM_LBUTTONDBLCLK: // Left double click
         {
-            MausEreignis me = {ME_DKLinks,
+            MouseEvent me = {ME_DKLinks,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -168,7 +168,7 @@ LRESULT CALLBACK Framework::WindowProc(
         }
     case WM_RBUTTONDBLCLK: // Right double click
         {
-            MausEreignis me = {ME_DKRechts,
+            MouseEvent me = {ME_DKRechts,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -180,7 +180,7 @@ LRESULT CALLBACK Framework::WindowProc(
         }
     case WM_MBUTTONDBLCLK: // Middle double click
         {
-            MausEreignis me = {ME_DKMitte,
+            MouseEvent me = {ME_DKMitte,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -193,7 +193,7 @@ LRESULT CALLBACK Framework::WindowProc(
     case WM_MOUSEHOVER: // Mouse enters window
         {
             MausTrack = 1;
-            MausEreignis me = {ME_Betritt,
+            MouseEvent me = {ME_Betritt,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -206,7 +206,7 @@ LRESULT CALLBACK Framework::WindowProc(
     case WM_MOUSELEAVE: // Mouse leaves window
         {
             MausTrack = 1;
-            MausEreignis me = {ME_Leaves,
+            MouseEvent me = {ME_Leaves,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -228,7 +228,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 TrackMouseEvent(&lptme);
                 MausTrack = 0;
             }
-            MausEreignis me = {ME_Bewegung,
+            MouseEvent me = {ME_Bewegung,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
@@ -245,7 +245,7 @@ LRESULT CALLBACK Framework::WindowProc(
             GetWindowRect(hwnd, &r);
             pos.x -= r.left;
             pos.y -= r.top;
-            MausEreignis me = {0, pos.x, pos.y, 0, 1, pos.x, pos.y};
+            MouseEvent me = {0, pos.x, pos.y, 0, 1, pos.x, pos.y};
             if ((int)(short)HIWORD(wparam) < 0)
                 me.id = !getTastenStand(T_Shift) ? ME_DScroll : ME_RScroll;
             else
@@ -256,7 +256,7 @@ LRESULT CALLBACK Framework::WindowProc(
         // Keyboard
     case WM_KEYDOWN:
         {
-            TastaturEreignis te = {
+            KeyboardEvent te = {
                 TE_Press, {0, 0, 0},
                  0, 0
             };
@@ -266,7 +266,7 @@ LRESULT CALLBACK Framework::WindowProc(
         } // Key is pressed
     case WM_KEYUP:
         {
-            TastaturEreignis te = {
+            KeyboardEvent te = {
                 TE_Release, {0, 0, 0},
                  0, 0
             };
@@ -299,7 +299,7 @@ void Framework::StopNachrichtenSchleife(HWND hwnd)
 }
 
 void Framework::CalculateEnteredString(
-    int virtualKeyCode, int scanCode, TastaturEreignis& te)
+    int virtualKeyCode, int scanCode, KeyboardEvent& te)
 {
     memset(te.taste, 0, sizeof(te.taste));
     te.virtualKey = virtualKeyCode;
@@ -545,12 +545,12 @@ void NativeWindow::zerstoeren()
     hdc = 0;
 }
 
-void NativeWindow::doMausAktion(MausEreignis& me)
+void NativeWindow::doMausAktion(MouseEvent& me)
 {
     if (!mausAktion || !mausAktion(makParam, this, me)) return;
     if (screen && me.id != ME_Betritt && me.id != ME_Leaves)
     {
-        screen->doMausEreignis(me);
+        screen->doMouseEvent(me);
         if (!me.verarbeitet && verschiebbar)
         {
             if (mx != -1 && my != -1) // move
@@ -603,10 +603,10 @@ void NativeWindow::doNSchliessAktion()
     nCloseAktion(sakParam, this);
 }
 
-void NativeWindow::doTastaturAktion(TastaturEreignis& te)
+void NativeWindow::doTastaturAktion(KeyboardEvent& te)
 {
     if (!tastaturAktion || !tastaturAktion(takParam, this, te)) return;
-    if (screen) screen->doTastaturEreignis(te);
+    if (screen) screen->doKeyboardEvent(te);
 }
 
 void NativeWindow::doRestoreMessage() // makes the border visible
@@ -615,7 +615,7 @@ void NativeWindow::doRestoreMessage() // makes the border visible
     ShowWindow(hWnd, 1);
 }
 
-void NativeWindow::setMausEreignisParameter(
+void NativeWindow::setMouseEventParameter(
     void* p) // sets the mouse event parameter
 {
     makParam = p;
@@ -627,7 +627,7 @@ void NativeWindow::setSchliessEreignisParameter(
     sakParam = p;
 }
 
-void NativeWindow::setTastaturEreignisParameter(
+void NativeWindow::setKeyboardEventParameter(
     void* p) // sets the keyboard event parameter
 {
     takParam = p;
@@ -980,7 +980,7 @@ bool NativeWindowArray::sendNSchliessMessage(HWND hwnd)
     return ret || next->sendNSchliessMessage(hwnd);
 }
 
-bool NativeWindowArray::sendMausMessage(HWND hwnd, MausEreignis& me)
+bool NativeWindowArray::sendMausMessage(HWND hwnd, MouseEvent& me)
 {
     if (!This) return 0;
     bool ret = 0;
@@ -993,7 +993,7 @@ bool NativeWindowArray::sendMausMessage(HWND hwnd, MausEreignis& me)
     return ret || next->sendMausMessage(hwnd, me);
 }
 
-bool NativeWindowArray::sendTastaturMessage(HWND hwnd, TastaturEreignis& te)
+bool NativeWindowArray::sendTastaturMessage(HWND hwnd, KeyboardEvent& te)
 {
     if (!This) return 0;
     bool ret = 0;
@@ -1062,8 +1062,8 @@ Window::Window()
 {
     style = Style::MEIgnoreVerarbeitet | Style::MEIgnoreSichtbar
           | Style::MEIgnoreParentInside | Style::MEIgnoreInside;
-    this->setMausEreignis(_ret1ME);
-    this->setTastaturEreignis(_ret1TE);
+    this->setMouseEvent(_ret1ME);
+    this->setKeyboardEvent(_ret1TE);
     min = Punkt(0, 0), max = Punkt(0, 0);
 }
 
@@ -1082,7 +1082,7 @@ Window::~Window()
     if (hScroll) hScroll->release();
 }
 
-void Window::doMausEreignis(MausEreignis& me, bool userRet)
+void Window::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (me.id == ME_Leaves)
     {
@@ -1106,8 +1106,8 @@ void Window::doMausEreignis(MausEreignis& me, bool userRet)
         if (hatStyle(Style::HScroll) && hScroll) me.mx += hScroll->getScroll();
         if (me.id != ME_Betritt && me.id != ME_Leaves)
         {
-            for (int i = members->getEintragAnzahl() - 1; i >= 0; i--)
-                members->z(i)->doPublicMausEreignis(me);
+            for (int i = members->getEntryCount() - 1; i >= 0; i--)
+                members->z(i)->doPublicMouseEvent(me);
         }
         me.mx += rbr;
         me.my += rbr + th;
@@ -1370,8 +1370,8 @@ void Window::doMausEreignis(MausEreignis& me, bool userRet)
     if (hatStyle(Style::HScroll) && hScroll) me.mx += hScroll->getScroll();
     if (me.id != ME_Betritt && me.id != ME_Leaves)
     {
-        for (int i = members->getEintragAnzahl() - 1; i >= 0; i--)
-            members->z(i)->doPublicMausEreignis(me);
+        for (int i = members->getEntryCount() - 1; i >= 0; i--)
+            members->z(i)->doPublicMouseEvent(me);
     }
     me.mx += rbr;
     me.my += rbr + th;
@@ -1463,25 +1463,25 @@ void Window::setTBgFarbe(int f) // sets title background color
     rend = 1;
 }
 
-// -- Title AlphaFeld --
-void Window::setTAlphaFeldZ(AlphaFeld* af) // sets the title AlphaFeld
+// -- Title AlphaField --
+void Window::setTAlphaFieldZ(AlphaField* af) // sets the title AlphaField
 {
     if (!titel) titel = new TextField();
-    titel->setAlphaFeldZ(af);
+    titel->setAlphaFieldZ(af);
     rend = 1;
 }
 
-void Window::setTAfFarbe(int f) // sets the title AlphaFeld color
+void Window::setTAfFarbe(int f) // sets the title AlphaField color
 {
     if (!titel) titel = new TextField();
-    titel->setAlphaFeldFarbe(f);
+    titel->setAlphaFieldColor(f);
     rend = 1;
 }
 
-void Window::setTAfStrength(int st) // sets the strength of the title AlphaFeld
+void Window::setTAfStrength(int st) // sets the strength of the title AlphaField
 {
     if (!titel) titel = new TextField();
-    titel->setAlphaFeldStrength(st);
+    titel->setAlphaFieldStrength(st);
     rend = 1;
 }
 
@@ -1550,24 +1550,24 @@ void Window::setKBgImageZ(Image* b)
     rend = 1;
 }
 
-// -- Body AlphaFeld --
-void Window::setKAlphaFeldZ(AlphaFeld* af) // sets the body AlphaFeld
+// -- Body AlphaField --
+void Window::setKAlphaFieldZ(AlphaField* af) // sets the body AlphaField
 {
     if (bodyBuffer) bodyBuffer->release();
     bodyBuffer = af;
     rend = 1;
 }
 
-void Window::setKAfFarbe(int f) // sets body AlphaFeld color
+void Window::setKAfFarbe(int f) // sets body AlphaField color
 {
-    if (!bodyBuffer) bodyBuffer = new AlphaFeld();
+    if (!bodyBuffer) bodyBuffer = new AlphaField();
     bodyBuffer->setFarbe(f);
     rend = 1;
 }
 
-void Window::setKAfStrength(int st) // sets the strength of the body AlphaFeld
+void Window::setKAfStrength(int st) // sets the strength of the body AlphaField
 {
-    if (!bodyBuffer) bodyBuffer = new AlphaFeld();
+    if (!bodyBuffer) bodyBuffer = new AlphaField();
     bodyBuffer->setStrength(st);
     rend = 1;
 }
@@ -1611,47 +1611,47 @@ void Window::setSBgImageZ(Image* b)
     rend = 1;
 }
 
-// -- Close AlphaFeld --
-void Window::setSAlphaFeldZ(AlphaFeld* af) // sets the close AlphaFeld
+// -- Close AlphaField --
+void Window::setSAlphaFieldZ(AlphaField* af) // sets the close AlphaField
 {
     if (closeBuffer) closeBuffer->release();
     closeBuffer = af;
     rend = 1;
 }
 
-void Window::setSAfFarbe(int f) // sets the color of the close AlphaFeld
+void Window::setSAfFarbe(int f) // sets the color of the close AlphaField
 {
-    if (!closeBuffer) closeBuffer = new AlphaFeld();
+    if (!closeBuffer) closeBuffer = new AlphaField();
     closeBuffer->setFarbe(f);
     rend = 1;
 }
 
-void Window::setSAfStrength(int st) // sets the strength of the close AlphaFeld
+void Window::setSAfStrength(int st) // sets the strength of the close AlphaField
 {
-    if (!closeBuffer) closeBuffer = new AlphaFeld();
+    if (!closeBuffer) closeBuffer = new AlphaField();
     closeBuffer->setStrength(st);
     rend = 1;
 }
 
-// -- Close Click AlphaFeld --
-void Window::setSKAlphaFeldZ(AlphaFeld* af) // sets the close click AlphaFeld
+// -- Close Click AlphaField --
+void Window::setSKAlphaFieldZ(AlphaField* af) // sets the close click AlphaField
 {
     if (closeKlickBuffer) closeKlickBuffer->release();
     closeKlickBuffer = af;
     rend = 1;
 }
 
-void Window::setSKAfFarbe(int f) // sets the color of the close click AlphaFeld
+void Window::setSKAfFarbe(int f) // sets the color of the close click AlphaField
 {
-    if (!closeKlickBuffer) closeKlickBuffer = new AlphaFeld();
+    if (!closeKlickBuffer) closeKlickBuffer = new AlphaField();
     closeKlickBuffer->setFarbe(f);
     rend = 1;
 }
 
 void Window::setSKAfStrength(
-    int st) // sets the strength of the close click AlphaFeld
+    int st) // sets the strength of the close click AlphaField
 {
-    if (!closeKlickBuffer) closeKlickBuffer = new AlphaFeld();
+    if (!closeKlickBuffer) closeKlickBuffer = new AlphaField();
     closeKlickBuffer->setStrength(st);
     rend = 1;
 }
@@ -1780,14 +1780,14 @@ void Window::addMember(Drawable* obj) // adds a member
 
 void Framework::Window::setMemberIndex(Drawable* zMember, int index)
 {
-    if (index < 0 || index >= members->getEintragAnzahl()) return;
+    if (index < 0 || index >= members->getEntryCount()) return;
     int currentIndex = members->indexOf(zMember);
     members->setPosition(currentIndex, index);
 }
 
 void Window::removeMember(Drawable* zObj) // removes a member
 {
-    for (int i = 0; i < members->getEintragAnzahl(); i++)
+    for (int i = 0; i < members->getEntryCount(); i++)
     {
         if (members->z(i) == zObj)
         {
@@ -1821,22 +1821,22 @@ bool Window::tick(double tickval) // tick
     return Drawable::tick(tickval);
 }
 
-void Window::doTastaturEreignis(TastaturEreignis& te)
+void Window::doKeyboardEvent(KeyboardEvent& te)
 {
     bool ntakc = !te.verarbeitet;
     if (hatStyle(Style::Sichtbar))
     {
         if (te.verarbeitet)
         {
-            for (int i = members->getEintragAnzahl() - 1; i >= 0; i--)
-                members->z(i)->doTastaturEreignis(te);
+            for (int i = members->getEntryCount() - 1; i >= 0; i--)
+                members->z(i)->doKeyboardEvent(te);
         }
         else
         {
             if (tak && tak(takParam, this, te))
             {
-                for (int i = members->getEintragAnzahl() - 1; i >= 0; i--)
-                    members->z(i)->doTastaturEreignis(te);
+                for (int i = members->getEntryCount() - 1; i >= 0; i--)
+                    members->z(i)->doKeyboardEvent(te);
             }
         }
     }
@@ -2095,30 +2095,30 @@ int Window::getTBgFarbe() const // returns the title background color
     return titel->getHintergrundFarbe();
 }
 
-// -- Title AlphaFeld --
-AlphaFeld* Window::getTAlphaFeld() const // returns the title AlphaFeld
+// -- Title AlphaField --
+AlphaField* Window::getTAlphaField() const // returns the title AlphaField
 {
     if (!titel) return 0;
-    return titel->getAlphaFeld();
+    return titel->getAlphaField();
 }
 
-AlphaFeld* Window::zTAlphaFeld() const
+AlphaField* Window::zTAlphaField() const
 {
     if (!titel) return 0;
-    return titel->zAlphaFeld();
+    return titel->zAlphaField();
 }
 
-int Window::getTAfFarbe() const // returns the color of the title AlphaFeld
+int Window::getTAfFarbe() const // returns the color of the title AlphaField
 {
     if (!titel) return 0;
-    return titel->getAlphaFeldFarbe();
+    return titel->getAlphaFieldColor();
 }
 
 int Window::getTAfStrength()
-    const // returns the strength of the title AlphaFeld
+    const // returns the strength of the title AlphaField
 {
     if (!titel) return 0;
-    return titel->getAlphaFeldStrength();
+    return titel->getAlphaFieldStrength();
 }
 
 // -- Title Background Image --
@@ -2177,25 +2177,25 @@ Image* Window::zKBgImage() const
     return bgBodyPicture;
 }
 
-// -- Body AlphaFeld --
-AlphaFeld* Window::getKAlphaFeld() const // returns the body AlphaFeld
+// -- Body AlphaField --
+AlphaField* Window::getKAlphaField() const // returns the body AlphaField
 {
     if (!bodyBuffer) return 0;
-    return dynamic_cast<AlphaFeld*>(bodyBuffer->getThis());
+    return dynamic_cast<AlphaField*>(bodyBuffer->getThis());
 }
 
-AlphaFeld* Window::zKAlphaFeld() const
+AlphaField* Window::zKAlphaField() const
 {
     return bodyBuffer;
 }
 
-int Window::getKAfFarbe() const // returns the body AlphaFeld color
+int Window::getKAfFarbe() const // returns the body AlphaField color
 {
     if (!bodyBuffer) return 0;
     return bodyBuffer->getFarbe();
 }
 
-int Window::getKAfStrength() const // returns the strength of the body AlphaFeld
+int Window::getKAfStrength() const // returns the strength of the body AlphaField
 {
     if (!bodyBuffer) return 0;
     return bodyBuffer->getStrength();
@@ -2219,51 +2219,51 @@ Image* Window::zSBgImage() const
     return bgClosingImage;
 }
 
-// -- Close AlphaFeld --
-AlphaFeld* Window::getSAlphaFeld() const // returns the close AlphaFeld
+// -- Close AlphaField --
+AlphaField* Window::getSAlphaField() const // returns the close AlphaField
 {
     if (!closeBuffer) return 0;
-    return dynamic_cast<AlphaFeld*>(closeBuffer->getThis());
+    return dynamic_cast<AlphaField*>(closeBuffer->getThis());
 }
 
-AlphaFeld* Window::zSAlphaFeld() const
+AlphaField* Window::zSAlphaField() const
 {
     return closeBuffer;
 }
 
-int Window::getSAfFarbe() const // returns the close AlphaFeld color
+int Window::getSAfFarbe() const // returns the close AlphaField color
 {
     if (!closeBuffer) return 0;
     return closeBuffer->getFarbe();
 }
 
 int Window::getSAfStrength()
-    const // returns the strength of the close AlphaFeld
+    const // returns the strength of the close AlphaField
 {
     if (!closeBuffer) return 0;
     return closeBuffer->getStrength();
 }
 
-// -- Close Click AlphaFeld --
-AlphaFeld* Window::getSKAlphaFeld() const // returns the close click AlphaFeld
+// -- Close Click AlphaField --
+AlphaField* Window::getSKAlphaField() const // returns the close click AlphaField
 {
     if (!closeKlickBuffer) return 0;
-    return dynamic_cast<AlphaFeld*>(closeKlickBuffer->getThis());
+    return dynamic_cast<AlphaField*>(closeKlickBuffer->getThis());
 }
 
-AlphaFeld* Window::zSKAlphaFeld() const
+AlphaField* Window::zSKAlphaField() const
 {
     return closeKlickBuffer;
 }
 
-int Window::getSKAfFarbe() const // returns the close click AlphaFeld color
+int Window::getSKAfFarbe() const // returns the close click AlphaField color
 {
     if (!closeKlickBuffer) return 0;
     return closeKlickBuffer->getFarbe();
 }
 
 int Window::getSKAfStrength()
-    const // returns the strength of the close click AlphaFeld
+    const // returns the strength of the close click AlphaField
 {
     if (!closeKlickBuffer) return 0;
     return closeKlickBuffer->getStrength();
@@ -2345,10 +2345,10 @@ Drawable* Window::dublizieren() const // Creates a copy of the window
     Window* ret = new Window();
     ret->setPosition(pos);
     ret->setSize(gr);
-    ret->setMausEreignisParameter(makParam);
-    ret->setTastaturEreignisParameter(takParam);
-    ret->setMausEreignis(mak);
-    ret->setTastaturEreignis(tak);
+    ret->setMouseEventParameter(makParam);
+    ret->setKeyboardEventParameter(takParam);
+    ret->setMouseEvent(mak);
+    ret->setKeyboardEvent(tak);
     if (toolTip) ret->setToolTipZ((ToolTip*)toolTip->dublizieren());
     ret->setStyle(style);
     ret->setClosingMeParam(closingMeParam);

Window.h

@@ -11,7 +11,7 @@ namespace Framework
     class TextField;      //! TextField.h
     class Border;        //! Border.h
     class Screen;    //! Screen.h
-    class AlphaFeld;     //! AlphaField.h
+    class AlphaField;     //! AlphaField.h
     class Font;       //! Font.h
     class Text;          //! Text.h
     class Image;          //! Image.h
@@ -42,7 +42,7 @@ namespace Framework
     //! Translates a keycode sent by Windows into the character of the
     //! pressed key
     DLLEXPORT void CalculateEnteredString(
-        int virtualKeyCode, int scanCode, TastaturEreignis& te);
+        int virtualKeyCode, int scanCode, KeyboardEvent& te);
 
     //! Class for a Windows API window
     class NativeWindow : public virtual ReferenceCounter
@@ -120,7 +120,7 @@ namespace Framework
         //! Processes mouse messages. Calls MausAktion and forwards events
         //! to the screen with objects if MausAktion returns 1
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausAktion(MausEreignis& me);
+        DLLEXPORT void doMausAktion(MouseEvent& me);
         //! Calls the pre-close callback function
         DLLEXPORT void doVSchliessAktion();
         //! Calls the post-close callback function
@@ -128,19 +128,19 @@ namespace Framework
         //! Processes keyboard messages. Calls TastaturAktion and forwards
         //! events to the screen with objects if TastaturAktion returns 1
         //! \param me The event triggered by the keyboard input
-        DLLEXPORT void doTastaturAktion(TastaturEreignis& et);
+        DLLEXPORT void doTastaturAktion(KeyboardEvent& et);
         //! Makes the window frame visible if loadBorderWindow was called
         DLLEXPORT void doRestoreMessage();
         //! Sets the parameter passed to the callback function on a mouse event
         //! \param p The parameter
-        DLLEXPORT void setMausEreignisParameter(void* p);
+        DLLEXPORT void setMouseEventParameter(void* p);
         //! Sets the parameter passed to the callback function on close
         //! \param p The parameter
         DLLEXPORT void setSchliessEreignisParameter(void* p);
         //! Sets the parameter passed to the callback function on a keyboard
         //! event
         //! \param p The parameter
-        DLLEXPORT void setTastaturEreignisParameter(void* p);
+        DLLEXPORT void setKeyboardEventParameter(void* p);
         //! Sets the callback function to be called on a mouse event.
         //! If the callback returns 0 or was not set, the mouse event is not
         //! further processed by the window. The standard function __ret1ME
@@ -238,11 +238,11 @@ namespace Framework
         //! Sends a mouse event to a specific window
         //! \param hWnd The handle to the window
         //! \param me The event triggered by the mouse input
-        DLLEXPORT bool sendMausMessage(HWND hWnd, MausEreignis& me);
+        DLLEXPORT bool sendMausMessage(HWND hWnd, MouseEvent& me);
         //! Sends a keyboard event to a specific window
         //! \param hWnd The handle to the window
         //! \param me The event triggered by the keyboard input
-        DLLEXPORT bool sendTastaturMessage(HWND hwnd, TastaturEreignis& te);
+        DLLEXPORT bool sendTastaturMessage(HWND hwnd, KeyboardEvent& te);
         //! Sends the event triggered by opening the window to a specific
         //! window \param hWnd The handle to the window
         DLLEXPORT bool sendRestoreMessage(HWND hwnd);
@@ -384,11 +384,11 @@ namespace Framework
         RCArray<Drawable>* members;
         int bgBodyColor;
         Image* bgBodyPicture;
-        AlphaFeld* bodyBuffer;
+        AlphaField* bodyBuffer;
         int bgClosingFarbe;
         Image* bgClosingImage;
-        AlphaFeld* closeBuffer;
-        AlphaFeld* closeKlickBuffer;
+        AlphaField* closeBuffer;
+        AlphaField* closeKlickBuffer;
         VScrollBar* vScroll;
         HScrollBar* hScroll;
         Punkt min, max;
@@ -400,7 +400,7 @@ namespace Framework
     protected:
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
+        DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
 
     public:
         //! Constructor
@@ -442,7 +442,7 @@ namespace Framework
         DLLEXPORT void setTBgFarbe(int f);
         //! Sets a pointer to the color gradient of the title
         //! \param af The color gradient
-        DLLEXPORT void setTAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setTAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient of the title
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setTAfFarbe(int f);
@@ -475,7 +475,7 @@ namespace Framework
         DLLEXPORT void setKBgImageZ(Image* b);
         //! Sets a pointer to the color gradient of the body
         //! \param af The color gradient
-        DLLEXPORT void setKAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setKAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient of the body
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setKAfFarbe(int f);
@@ -503,7 +503,7 @@ namespace Framework
         DLLEXPORT void setSBgImageZ(Image* b);
         //! Sets a pointer to the color gradient of the close button
         //! \param af The color gradient
-        DLLEXPORT void setSAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setSAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient of the close button
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setSAfFarbe(int f);
@@ -512,7 +512,7 @@ namespace Framework
         DLLEXPORT void setSAfStrength(int st);
         //! Sets a pointer to the color gradient used when clicking the
         //! close button \param af The color gradient
-        DLLEXPORT void setSKAlphaFeldZ(AlphaFeld* af);
+        DLLEXPORT void setSKAlphaFieldZ(AlphaField* af);
         //! Sets the color of the color gradient used when clicking the
         //! close button \param f The color in A8R8G8B8 format
         DLLEXPORT void setSKAfFarbe(int f);
@@ -589,7 +589,7 @@ namespace Framework
         DLLEXPORT bool tick(double tickval) override;
         //! Processes keyboard messages
         //! \param me The event triggered by the keyboard input
-        DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
+        DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
         //! Draws the window to zRObj if it is visible
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
@@ -625,9 +625,9 @@ namespace Framework
         //! Returns the background color of the title in A8R8G8B8 format
         DLLEXPORT int getTBgFarbe() const;
         //! Returns the color gradient of the title
-        DLLEXPORT AlphaFeld* getTAlphaFeld() const;
+        DLLEXPORT AlphaField* getTAlphaField() const;
         //! Returns the color gradient of the title without increased reference counter
-        DLLEXPORT AlphaFeld* zTAlphaFeld() const;
+        DLLEXPORT AlphaField* zTAlphaField() const;
         //! Returns the color of the color gradient of the title in A8R8G8B8 format
         DLLEXPORT int getTAfFarbe() const;
         //! Returns the strength of the color gradient of the title
@@ -651,9 +651,9 @@ namespace Framework
         //! Returns the background image of the body without increased reference counter
         DLLEXPORT Image* zKBgImage() const;
         //! Returns the color gradient of the body
-        DLLEXPORT AlphaFeld* getKAlphaFeld() const;
+        DLLEXPORT AlphaField* getKAlphaField() const;
         //! Returns the color gradient of the body without increased reference counter
-        DLLEXPORT AlphaFeld* zKAlphaFeld() const;
+        DLLEXPORT AlphaField* zKAlphaField() const;
         //! Returns the color of the color gradient of the body in A8R8G8B8 format
         DLLEXPORT int getKAfFarbe() const;
         //! Returns the strength of the color gradient of the body
@@ -666,20 +666,20 @@ namespace Framework
         //! reference counter
         DLLEXPORT Image* zSBgImage() const;
         //! Returns the color gradient of the close button
-        DLLEXPORT AlphaFeld* getSAlphaFeld() const;
+        DLLEXPORT AlphaField* getSAlphaField() const;
         //! Returns the color gradient of the close button without increased
         //! reference counter
-        DLLEXPORT AlphaFeld* zSAlphaFeld() const;
+        DLLEXPORT AlphaField* zSAlphaField() const;
         //! Returns the color of the color gradient of the close button in
         //! A8R8G8B8 format
         DLLEXPORT int getSAfFarbe() const;
         //! Returns the strength of the color gradient of the close button
         DLLEXPORT int getSAfStrength() const;
         //! Returns the color gradient used when the close button is pressed
-        DLLEXPORT AlphaFeld* getSKAlphaFeld() const;
+        DLLEXPORT AlphaField* getSKAlphaField() const;
         //! Returns the color gradient without increased reference counter
         //! used when the close button is pressed
-        DLLEXPORT AlphaFeld* zSKAlphaFeld() const;
+        DLLEXPORT AlphaField* zSKAlphaField() const;
         //! Returns the color of the color gradient in A8R8G8B8 format
         //! used when the close button is pressed
         DLLEXPORT int getSKAfFarbe() const;

World2D.cpp

@@ -139,7 +139,7 @@ bool Object2D::handleCollision(Object2D* obj)
     return 0;
 }
 
-bool Object2D::tick(const WeltInfo& info, double zeit)
+bool Object2D::tick(const WorldInfo& info, double zeit)
 {
     while (!actions.empty())
     {
@@ -272,40 +272,40 @@ bool Object2D::canCollide()
     return collision;
 }
 
-Welt2D::Welt2D()
+World2D::World2D()
     : ReferenceCounter()
 {
     objects = new RCArray<Object2D>();
-    memset(&info, 0, sizeof(WeltInfo));
+    memset(&info, 0, sizeof(WorldInfo));
 }
 
-Welt2D::~Welt2D()
+World2D::~World2D()
 {
     objects->release();
 }
 
-void Welt2D::setAirResistance(float resistance)
+void World2D::setAirResistance(float resistance)
 {
     info.airResistance = resistance;
 }
 
-void Welt2D::setSize(int width, int height)
+void World2D::setSize(int width, int height)
 {
     info.size.x = width;
     info.size.y = height;
 }
 
-void Welt2D::setSize(bool hasSize)
+void World2D::setSize(bool hasSize)
 {
     info.hasSize = hasSize;
 }
 
-void Welt2D::setCircular(bool circular)
+void World2D::setCircular(bool circular)
 {
     info.circular = circular;
 }
 
-Object2D* Welt2D::zObjectAt(int x, int y, bool ignoreTransparentFlag)
+Object2D* World2D::zObjectAt(int x, int y, bool ignoreTransparentFlag)
 {
     for (auto o : *objects)
     {
@@ -314,20 +314,20 @@ Object2D* Welt2D::zObjectAt(int x, int y, bool ignoreTransparentFlag)
     return 0;
 }
 
-Object2D* Welt2D::getObjectAt(int x, int y, bool ignoreTransparentFlag)
+Object2D* World2D::getObjectAt(int x, int y, bool ignoreTransparentFlag)
 {
     Object2D* tmp = zObjectAt(x, y, ignoreTransparentFlag);
     return tmp ? dynamic_cast<Object2D*>(tmp->getThis()) : 0;
 }
 
-void Welt2D::addObject(Object2D* obj)
+void World2D::addObject(Object2D* obj)
 {
     objects->add(obj);
 }
 
-void Welt2D::removeObject(Object2D* zObj)
+void World2D::removeObject(Object2D* zObj)
 {
-    int anz = objects->getEintragAnzahl();
+    int anz = objects->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
         if (objects->z(i) == zObj)
@@ -338,12 +338,12 @@ void Welt2D::removeObject(Object2D* zObj)
     }
 }
 
-void Welt2D::removeAll()
+void World2D::removeAll()
 {
     objects->leeren();
 }
 
-void Welt2D::explosion(Vertex worldPos, float intensity, float maxRad)
+void World2D::explosion(Vertex worldPos, float intensity, float maxRad)
 {
     maxRad = maxRad * maxRad;
     for (auto obj : *objects)
@@ -380,7 +380,7 @@ void Welt2D::explosion(Vertex worldPos, float intensity, float maxRad)
     }
 }
 
-void Welt2D::impuls(Vertex worldPos, Vertex worldDir)
+void World2D::impuls(Vertex worldPos, Vertex worldDir)
 {
     Vertex hitPoint;
     float dist = INFINITY;
@@ -399,7 +399,7 @@ void Welt2D::impuls(Vertex worldPos, Vertex worldDir)
     if (o) o->impuls(worldPos, worldDir);
 }
 
-bool Welt2D::tick(double zeit)
+bool World2D::tick(double zeit)
 {
     bool ret = 0;
     for (auto obj = objects->begin(); obj; obj++)
@@ -416,7 +416,7 @@ bool Welt2D::tick(double zeit)
     return ret;
 }
 
-void Welt2D::render(Mat3<float>& kamMat,
+void World2D::render(Mat3<float>& kamMat,
     Punkt size,
     Image& zRObj,
     int xOffset,
@@ -447,7 +447,7 @@ void Welt2D::render(Mat3<float>& kamMat,
     }
 }
 
-void Welt2D::render(
+void World2D::render(
     Mat3<float>& kamMat, Punkt size, Image& zRObj, const char* kamName)
 {
     if (!info.hasSize || !info.circular)
@@ -486,12 +486,12 @@ void Welt2D::render(
     }
 }
 
-const WeltInfo& Welt2D::getWorldInfo() const
+const WorldInfo& World2D::getWorldInfo() const
 {
     return info;
 }
 
-ArrayIterator<Object2D*> Welt2D::getMembers()
+ArrayIterator<Object2D*> World2D::getMembers()
 {
     return objects->begin();
 }

World2D.h

@@ -13,7 +13,7 @@ namespace Framework
     typedef Vec2<float> Vertex;
     class Image;
 
-    struct WeltInfo
+    struct WorldInfo
     {
         float airResistance;
         bool hasSize;
@@ -85,7 +85,7 @@ namespace Framework
         DLLEXPORT virtual bool handleCollision(Object2D* obj);
         //! Processes elapsed time and updates the position and rotation
         //! of the object in the world \param zeit The elapsed time in seconds
-        DLLEXPORT virtual bool tick(const WeltInfo& info, double zeit);
+        DLLEXPORT virtual bool tick(const WorldInfo& info, double zeit);
         //! Draws the object into an image
         //! \param kamMat The camera matrix that converts a point from
         //! world coordinates to screen coordinates \param zRObj The image
@@ -166,11 +166,11 @@ namespace Framework
         DLLEXPORT bool canCollide();
     };
 
-    class Welt2D : public virtual ReferenceCounter
+    class World2D : public virtual ReferenceCounter
     {
     private:
         RCArray<Object2D>* objects;
-        WeltInfo info;
+        WorldInfo info;
 
         void render(Mat3<float>& kamMat,
             Punkt size,
@@ -180,8 +180,8 @@ namespace Framework
             const char* kamName);
 
     public:
-        DLLEXPORT Welt2D();
-        DLLEXPORT ~Welt2D();
+        DLLEXPORT World2D();
+        DLLEXPORT ~World2D();
         DLLEXPORT void setAirResistance(float resistance);
         DLLEXPORT void setSize(int width, int height);
         DLLEXPORT void setSize(bool hasSize);
@@ -199,7 +199,7 @@ namespace Framework
         DLLEXPORT bool tick(double zeit);
         DLLEXPORT void render(
             Mat3<float>& kamMat, Punkt size, Image& zRObj, const char* kamName);
-        DLLEXPORT const WeltInfo& getWorldInfo() const;
+        DLLEXPORT const WorldInfo& getWorldInfo() const;
         DLLEXPORT ArrayIterator<Object2D*> getMembers();
     };
 } // namespace Framework

World3D.cpp

@@ -9,9 +9,9 @@
 
 using namespace Framework;
 
-// Contents of the Welt3D class from World3D.h
+// Contents of the World3D class from World3D.h
 // Konstructor
-Welt3D::Welt3D()
+World3D::World3D()
     : Model3DCollection()
 {
     members = new RCArray<Model3D>();
@@ -23,7 +23,7 @@ Welt3D::Welt3D()
 }
 
 // Destructor
-Welt3D::~Welt3D()
+World3D::~World3D()
 {
     members->release();
     delete[] pointLights;
@@ -31,20 +31,20 @@ Welt3D::~Welt3D()
 }
 
 // Blocks access to the object and waits for access if necessary
-void Welt3D::lock()
+void World3D::lock()
 {
     cs.lock();
 }
 
 // Releases the object for other threads
-void Welt3D::unlock()
+void World3D::unlock()
 {
     cs.unlock();
 }
 
 // Adds an object to the world
 //  obj: The object to be added
-void Welt3D::addDrawable(Model3D* obj)
+void World3D::addDrawable(Model3D* obj)
 {
     cs.lock();
     if (debugDX)
@@ -61,7 +61,7 @@ void Welt3D::addDrawable(Model3D* obj)
 
 // Removes an object from the world
 //  obj: The object to be removed
-void Welt3D::removeDrawable(Model3D* obj)
+void World3D::removeDrawable(Model3D* obj)
 {
     cs.lock();
     int index = 0;
@@ -80,7 +80,7 @@ void Welt3D::removeDrawable(Model3D* obj)
 
 //! Adds a collection of objects to the world
 //! \param collection The collection to be added
-void Welt3D::addCollection(Model3DCollection* collection)
+void World3D::addCollection(Model3DCollection* collection)
 {
     cs.lock();
     modelCollections.add(collection);
@@ -90,7 +90,7 @@ void Welt3D::addCollection(Model3DCollection* collection)
 
 //! removes a collection of models from the world
 //! \param zCollection The collection to be removed
-void Welt3D::removeCollection(Model3DCollection* zCollection)
+void World3D::removeCollection(Model3DCollection* zCollection)
 {
     cs.lock();
     int index = 0;
@@ -109,7 +109,7 @@ void Welt3D::removeCollection(Model3DCollection* zCollection)
 
 // Processes a mouse event
 //  me: The mouse event to be processed
-void Welt3D::doMausEreignis(MausEreignis3D& me)
+void World3D::doMouseEvent(MouseEvent3D& me)
 {
     // cs.lock()
     // int anz = 0;
@@ -150,7 +150,7 @@ void Welt3D::doMausEreignis(MausEreignis3D& me)
     //     }
     //     if( ind >= 0 )
     //     {
-    //         alphaVS[ ind ]->doMausEreignis( me );
+    //         alphaVS[ ind ]->doMouseEvent( me );
     //         if( me.verarbeitet )
     //         {
     //             cs.unlock();
@@ -166,7 +166,7 @@ void Welt3D::doMausEreignis(MausEreignis3D& me)
 //  tickval: The time in seconds since the last call of the function
 //  return: true if the object has changed, false
 //  otherwise.
-bool Welt3D::tick(double tickval)
+bool World3D::tick(double tickval)
 {
     cs.lock();
     rend |= tick(
@@ -182,7 +182,7 @@ bool Welt3D::tick(double tickval)
 //  point: The origin of the ray,
 //  dir: The direction of the ray
 //  return: The color of the ray
-int Welt3D::traceRay(Vec3<float>& point, Vec3<float>& dir)
+int World3D::traceRay(Vec3<float>& point, Vec3<float>& dir)
 {
     float min = INFINITY;
     int pId = 0;
@@ -200,7 +200,7 @@ int Welt3D::traceRay(Vec3<float>& point, Vec3<float>& dir)
 }
 
 //! executes a function on every model
-void Framework::Welt3D::forAll(std::function<void(Model3D*)> f)
+void Framework::World3D::forAll(std::function<void(Model3D*)> f)
 {
     for (auto m : *members)
         f(m);
@@ -209,7 +209,7 @@ void Framework::Welt3D::forAll(std::function<void(Model3D*)> f)
 }
 
 //! executes a tick function on every model
-bool Welt3D::tick(std::function<void(Model3D*)> f, double time)
+bool World3D::tick(std::function<void(Model3D*)> f, double time)
 {
     for (auto m : *members)
         f(m);
@@ -220,7 +220,7 @@ bool Welt3D::tick(std::function<void(Model3D*)> f, double time)
 }
 
 //! executes a render function on every model
-void Welt3D::render(std::function<void(Model3D*)> f)
+void World3D::render(std::function<void(Model3D*)> f)
 {
     for (auto m : *members)
         f(m);
@@ -228,17 +228,17 @@ void Welt3D::render(std::function<void(Model3D*)> f)
         c->render(f);
 }
 
-int Framework::Welt3D::getPointLightCount() const
+int Framework::World3D::getPointLightCount() const
 {
     return pointLightCount;
 }
 
-int Framework::Welt3D::getDiffuseLightCount() const
+int Framework::World3D::getDiffuseLightCount() const
 {
     return diffuseLightCount;
 }
 
-void Framework::Welt3D::copyLight(DXBuffer* zDiffuse, DXBuffer* zPoints) const
+void Framework::World3D::copyLight(DXBuffer* zDiffuse, DXBuffer* zPoints) const
 {
     zDiffuse->setData(diffuseLights);
     zDiffuse->setLength(diffuseLightCount * (int)sizeof(DiffuseLight));
@@ -250,7 +250,7 @@ void Framework::Welt3D::copyLight(DXBuffer* zDiffuse, DXBuffer* zPoints) const
 
 //! adds a new diffuse light source
 //! \param light The new light source
-void Framework::Welt3D::addDiffuseLight(DiffuseLight light)
+void Framework::World3D::addDiffuseLight(DiffuseLight light)
 {
     DiffuseLight* tmp = new DiffuseLight[diffuseLightCount + 1];
     memcpy(tmp, diffuseLights, sizeof(DiffuseLight) * diffuseLightCount);
@@ -262,7 +262,7 @@ void Framework::Welt3D::addDiffuseLight(DiffuseLight light)
 
 //! adds a new point light source
 //! \param light The new light source
-void Framework::Welt3D::addPointLight(PointLight light)
+void Framework::World3D::addPointLight(PointLight light)
 {
     PointLight* tmp = new PointLight[pointLightCount + 1];
     memcpy(tmp, pointLights, sizeof(PointLight) * pointLightCount);
@@ -274,21 +274,21 @@ void Framework::Welt3D::addPointLight(PointLight light)
 
 //! Returns the reference to a diffuse light source
 //! \param index The index of the light source
-DiffuseLight& Framework::Welt3D::getDiffuseLight(int index) const
+DiffuseLight& Framework::World3D::getDiffuseLight(int index) const
 {
     return diffuseLights[index];
 }
 
 //! Returns the reference to a point light source
 //! \param index The index of the light source
-PointLight& Framework::Welt3D::getPointLight(int index) const
+PointLight& Framework::World3D::getPointLight(int index) const
 {
     return pointLights[index];
 }
 
 //! removes a specific fiffuse light from the world
 //! \param index the index of the light
-DLLEXPORT void Framework::Welt3D::removeDiffuseLight(int index)
+DLLEXPORT void Framework::World3D::removeDiffuseLight(int index)
 {
     for (int i = index; i < diffuseLightCount - 1; i++)
     {
@@ -299,7 +299,7 @@ DLLEXPORT void Framework::Welt3D::removeDiffuseLight(int index)
 
 //! removes a specific point light from the world
 //! \param index the index of the light
-DLLEXPORT void Framework::Welt3D::removePointLight(int index)
+DLLEXPORT void Framework::World3D::removePointLight(int index)
 {
     for (int i = index; i < pointLightCount - 1; i++)
     {

World3D.h

@@ -10,13 +10,13 @@ namespace Framework
 {
     class Drawable3D;     //! Drawing.h
     class Render3D;        //! Render3D.h
-    struct MausEreignis3D; //! MouseEvent.h
+    struct MouseEvent3D; //! MouseEvent.h
     class Model3D;
     class DXBuffer;
-    class Welt3D;
+    class World3D;
 
     //! Stores all 3D drawings of a scene
-    class Welt3D : public Model3DCollection
+    class World3D : public Model3DCollection
     {
     protected:
         DiffuseLight* diffuseLights;
@@ -32,9 +32,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT Welt3D();
+        DLLEXPORT World3D();
         //! Destructor
-        DLLEXPORT virtual ~Welt3D();
+        DLLEXPORT virtual ~World3D();
         //! Locks access to the object and waits for access if necessary
         DLLEXPORT void lock();
         //! Releases the object for other threads
@@ -53,7 +53,7 @@ namespace Framework
         DLLEXPORT void removeCollection(Model3DCollection* zCollection);
         //! Processes a mouse event
         //! \param me The mouse event to process
-        DLLEXPORT void doMausEreignis(MausEreignis3D& me);
+        DLLEXPORT void doMouseEvent(MouseEvent3D& me);
         //! Processes elapsed time
         //! \param tickval The time in seconds since the last call of this
         //! function \return true if the object changed, false otherwise.

XML.cpp

@@ -278,7 +278,7 @@ void Element::setAttribute(Text attribut, Text value)
 //  attribut: The name of the attribute
 void Element::removeAttribute(Text attribut)
 {
-    for (int i = 0; i < attributes->getEintragAnzahl(); i++)
+    for (int i = 0; i < attributes->getEntryCount(); i++)
     {
         if (attributes->z(i)->istGleich(attribut))
         {
@@ -309,7 +309,7 @@ void Element::addChildAtFront(Element* child)
 //  zChild: The child to remove
 void Element::removeChild(Element* child)
 {
-    for (int i = 0; i < children->getEintragAnzahl(); i++)
+    for (int i = 0; i < children->getEntryCount(); i++)
     {
         if (children->z(i) == child)
         {
@@ -364,7 +364,7 @@ Text Element::getText() const
 // Returns the number of children
 int Element::getChildCount() const
 {
-    return children->getEintragAnzahl();
+    return children->getEntryCount();
 }
 
 int Framework::XML::Element::getChildIndex(Element* zChild) const
@@ -471,7 +471,7 @@ bool Element::hasAttribute(Text name) const
 // Returns the number of attributes
 int Element::getAttributeCount() const
 {
-    return attributes->getEintragAnzahl();
+    return attributes->getEntryCount();
 }
 
 // Returns the name of the i-th attribute
@@ -526,7 +526,7 @@ Text Element::toString() const
 {
     Text ret = "<";
     ret += name->getText();
-    if (attributes->getEintragAnzahl()) ret += " ";
+    if (attributes->getEntryCount()) ret += " ";
     for (auto i = attributes->begin(), j = attributeValues->begin(); i && j;
         i++, j++)
     {
@@ -549,10 +549,10 @@ Text Element::toString() const
         }
         if (i.hasNext()) ret += " ";
     }
-    if (children->getEintragAnzahl() || text->getLength())
+    if (children->getEntryCount() || text->getLength())
     {
         ret += ">";
-        if (children->getEintragAnzahl())
+        if (children->getEntryCount())
         {
             for (auto i : *children)
                 ret += i->toString();
@@ -592,7 +592,7 @@ Editor::~Editor()
 
 Maybe<RCPointer<Element>> Framework::XML::Editor::getFirstElement() const
 {
-    if (this->elements->getEintragAnzahl() > 0)
+    if (this->elements->getEntryCount() > 0)
     {
         return Maybe<RCPointer<Element>>::of(
             RCPointer<Element>::of(this->elements->get(0)));
@@ -752,7 +752,7 @@ Editor Editor::whereChildWithNameExists(Text name) const
     RCArray<Element>* list = new RCArray<Element>();
     for (auto i : *elements)
     {
-        if (i->selectChildsByName(name).elements->getEintragAnzahl())
+        if (i->selectChildsByName(name).elements->getEntryCount())
             list->add(dynamic_cast<XML::Element*>(i->getThis()));
     }
     return Editor(list);
@@ -765,7 +765,7 @@ Editor Editor::whereChildWithAttributeExists(Text attribute) const
     RCArray<Element>* list = new RCArray<Element>();
     for (auto i : *elements)
     {
-        if (i->selectChildsByAttribute(attribute).elements->getEintragAnzahl())
+        if (i->selectChildsByAttribute(attribute).elements->getEntryCount())
             list->add(dynamic_cast<XML::Element*>(i->getThis()));
     }
     return Editor(list);
@@ -780,7 +780,7 @@ Editor Editor::whereChildWithAttributeExists(Text attribute, Text value) const
     for (auto i : *elements)
     {
         if (i->selectChildsByAttribute(attribute, value)
-                .elements->getEintragAnzahl())
+                .elements->getEntryCount())
             list->add(dynamic_cast<XML::Element*>(i->getThis()));
     }
     return Editor(list);
@@ -842,13 +842,13 @@ void Editor::forEach(std::function<void(Element*)> f) const
 //! returns 1 if the editor contains at least one element, 0 otherwise
 bool Editor::exists() const
 {
-    return elements->getEintragAnzahl() > 0;
+    return elements->getEntryCount() > 0;
 }
 
 //! returns the number of elements in the editor
 int Editor::getSize() const
 {
-    return elements->getEintragAnzahl();
+    return elements->getEntryCount();
 }
 
 DLLEXPORT Editor& Framework::XML::Editor::operator=(const Editor& e)