rename german functions and variables

AbstractElement.cpp

@@ -27,12 +27,12 @@ void Framework::ElementPath::next()
 
 bool Framework::ElementPath::isObjectAttribute() const
 {
-    return path->z(index)->hatAt(0, ".");
+    return path->z(index)->hasAt(0, ".");
 }
 
 bool Framework::ElementPath::isArrayElement() const
 {
-    return path->z(index)->hatAt(0, "[");
+    return path->z(index)->hasAt(0, "[");
 }
 
 int Framework::ElementPath::getArrayIndex() const

AlphaField.cpp

@@ -13,7 +13,7 @@ using namespace Framework;
 AlphaField::AlphaField()
     : Drawable(),
       strength(5),
-      farbe(0x9B000000)
+      color(0x9B000000)
 {}
 
 AlphaField::~AlphaField() {}
@@ -25,9 +25,9 @@ void AlphaField::setStrength(int st) // sets the strength
     rend = 1;
 }
 
-void AlphaField::setFarbe(int f) // sets the color
+void AlphaField::setColor(int f) // sets the color
 {
-    farbe = f;
+    color = f;
     rend = 1;
 }
 
@@ -37,10 +37,10 @@ void AlphaField::render(Image& zRObj) // draws to zRObj
     int br = gr.x - 1;
     int hi = gr.y - 1;
     int xp = pos.x, yp = pos.y;
-    int a = (farbe >> 24) & 0xFF;
+    int a = (color >> 24) & 0xFF;
     int index = (br / 2) * (br <= hi) + (hi / 2) * (br > hi);
-    int fc = farbe & 0x00FFFFFF;
-    int fc2 = farbe;
+    int fc = color & 0x00FFFFFF;
+    int fc2 = color;
     if (strength > 0) index = index > (a / strength) ? a / strength : index;
     if (strength < 0)
         index
@@ -50,21 +50,21 @@ void AlphaField::render(Image& zRObj) // draws to zRObj
         a -= strength;
         fc2 = (a << 24) | fc;
         int i2 = i << 1;
-        zRObj.drawLinieHAlpha(
+        zRObj.drawLineHAlpha(
             xp + i + 1, yp + i, br - i2, fc2); // top left --- top right
-        zRObj.drawLinieVAlpha(xp + br - i,
+        zRObj.drawLineVAlpha(xp + br - i,
             yp + i + 1,
             hi - i2,
             fc2); // top right -- bottom right
-        zRObj.drawLinieHAlpha(
+        zRObj.drawLineHAlpha(
             xp + i, yp + hi - i, br - i2, fc2); // bottom right - bottom left
-        zRObj.drawLinieVAlpha(
+        zRObj.drawLineVAlpha(
             xp + i, yp + i, hi - i2, fc2); // bottom left -- top left
     }
     if (index == br / 2)
     {
         for (int i = index; i <= index + (br - index) - index; ++i)
-            zRObj.drawLinieVAlpha(xp + i,
+            zRObj.drawLineVAlpha(xp + i,
                 yp + index,
                 hi - (index << 1) + 1,
                 fc2); // remaining area vertical
@@ -72,7 +72,7 @@ void AlphaField::render(Image& zRObj) // draws to zRObj
     else
     {
         for (int i = index; i <= index + (hi - index) - index; ++i)
-            zRObj.drawLinieHAlpha(xp + index,
+            zRObj.drawLineHAlpha(xp + index,
                 yp + i,
                 br - (index << 1) + 1,
                 fc2); // remaining area horizontal
@@ -85,12 +85,12 @@ int AlphaField::getStrength() const // returns the strength
     return strength;
 }
 
-int AlphaField::getFarbe() const // returns the color
+int AlphaField::getColor() const // returns the color
 {
-    return farbe;
+    return color;
 }
 
-Drawable* AlphaField::dublizieren() const // copies the drawing object
+Drawable* AlphaField::duplicate() const // copies the drawing object
 {
     AlphaField* obj = new AlphaField();
     obj->setPosition(pos);
@@ -99,8 +99,8 @@ Drawable* AlphaField::dublizieren() const // copies the drawing object
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setStrength(strength);
-    obj->setFarbe(farbe);
+    obj->setColor(color);
     return obj;
 }

AlphaField.h

@@ -14,7 +14,7 @@ namespace Framework
     {
     private:
         int strength;
-        int farbe;
+        int color;
 
     public:
         //! Constructor
@@ -27,17 +27,17 @@ namespace Framework
         DLLEXPORT void setStrength(int st);
         //! Sets the color of the alpha field
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setFarbe(int f);
+        DLLEXPORT void setColor(int f);
         //! Draws the drawing into a specific image
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
         //! Returns the strength of the alpha field
         DLLEXPORT int getStrength() const;
         //! returns the color of the alpha field in A8R8G8B8 format
-        DLLEXPORT int getFarbe() const;
+        DLLEXPORT int getColor() const;
         //! Copies the alpha field so that it can be used
         //! without affecting the original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 } // namespace Framework
 

Animation.cpp

@@ -14,7 +14,7 @@ using namespace Framework;
 Animation2DData::Animation2DData()
     : ReferenceCounter(),
       bilder(0),
-      bildAnzahl(0),
+      imageCount(0),
       fps(0),
       wiederhohlen(0),
       transparent(0)
@@ -37,54 +37,54 @@ void Animation2DData::unlock()
     cs.unlock();
 }
 
-void Animation2DData::ladeAnimation(InitFile* datei)
+void Animation2DData::loadAnimation(InitFile* datei)
 {
     if (!datei) return;
     reset();
-    int anz = datei->getWertAnzahl();
+    int anz = datei->getValueCount();
     lock();
-    if (datei->wertExistiert("fps"))
+    if (datei->valueExists("fps"))
     {
         --anz;
-        fps = TextZuInt(datei->zWert("fps")->getText(), 10);
+        fps = TextZuInt(datei->zValue("fps")->getText(), 10);
     }
-    if (datei->wertExistiert("wiederhohlen"))
+    if (datei->valueExists("wiederhohlen"))
     {
         --anz;
-        wiederhohlen = datei->zWert("wiederhohlen")->istGleich("true");
+        wiederhohlen = datei->zValue("wiederhohlen")->isEqual("true");
     }
-    if (datei->wertExistiert("transparent"))
+    if (datei->valueExists("transparent"))
     {
         --anz;
-        transparent = datei->zWert("transparent")->istGleich("true");
+        transparent = datei->zValue("transparent")->isEqual("true");
     }
     Image** bilder = new Image*[anz];
     int j = 0;
     for (int i = 0; i < anz; ++i)
     {
         bilder[j] = 0;
-        if (datei->zName(i)->istGleich("fps")
-            || datei->zName(i)->istGleich("wiederhohlen")
-            || datei->zName(i)->istGleich("transparent"))
+        if (datei->zName(i)->isEqual("fps")
+            || datei->zName(i)->isEqual("wiederhohlen")
+            || datei->zName(i)->isEqual("transparent"))
             continue;
-        Text pfad = datei->zWert(i)->getText();
-        if (pfad.hat(".ltdb/") && pfad.getLength() > 7)
+        Text pfad = datei->zValue(i)->getText();
+        if (pfad.has(".ltdb/") && pfad.getLength() > 7)
         {
             Text* name = pfad.getTeilText(
-                pfad.positionVon(".ltdb/", pfad.anzahlVon(".ltdb/") - 1) + 6);
+                pfad.positionOf(".ltdb/", pfad.countOf(".ltdb/") - 1) + 6);
             Text* tmp
                 = pfad.getTeilText(0, pfad.getLength() - name->getLength() - 1);
             pfad.setText(*tmp);
             tmp->release();
             LTDBFile* dat = new LTDBFile();
             dat->setFile(dynamic_cast<Text*>(pfad.getThis()));
-            dat->leseDaten(0);
-            bilder[j] = dat->laden(0, name);
+            dat->readData(0);
+            bilder[j] = dat->load(0, name);
             dat->release();
         }
         ++j;
     }
-    this->bilder = new Image*[bildAnzahl];
+    this->bilder = new Image*[imageCount];
     j = 0;
     for (int i = 0; i < anz; ++i)
     {
@@ -98,21 +98,21 @@ void Animation2DData::ladeAnimation(InitFile* datei)
     datei->release();
 }
 
-void Animation2DData::ladeAnimation(LTDBFile* datei)
+void Animation2DData::loadAnimation(LTDBFile* datei)
 {
     if (!datei) return;
     reset();
-    datei->leseDaten(0);
-    int anz = datei->getImageAnzahl();
+    datei->readData(0);
+    int anz = datei->getImageCount();
     RCArray<Text>* list = datei->zImageListe();
     lock();
     Image** bilder = new Image*[anz];
     for (int i = 0; i < anz; ++i)
     {
-        bilder[i] = datei->laden(0, list->get(i));
-        if (bilder[i]) ++bildAnzahl;
+        bilder[i] = datei->load(0, list->get(i));
+        if (bilder[i]) ++imageCount;
     }
-    this->bilder = new Image*[bildAnzahl];
+    this->bilder = new Image*[imageCount];
     int j = 0;
     for (int i = 0; i < anz; ++i)
     {
@@ -144,11 +144,11 @@ void Animation2DData::setTransparent(bool trp)
 void Animation2DData::reset()
 {
     lock();
-    for (int i = 0; i < bildAnzahl; ++i)
+    for (int i = 0; i < imageCount; ++i)
         bilder[i] = (Image*)bilder[i]->release();
     delete[] bilder;
     bilder = 0;
-    bildAnzahl = 0;
+    imageCount = 0;
     fps = 30;
     wiederhohlen = 0;
     transparent = 0;
@@ -158,19 +158,19 @@ void Animation2DData::reset()
 // constant
 Image* Animation2DData::getImage(int i) const
 {
-    return (i >= 0 && i < bildAnzahl)
+    return (i >= 0 && i < imageCount)
              ? dynamic_cast<Image*>(bilder[i]->getThis())
              : 0;
 }
 
 Image* Animation2DData::zImage(int i) const
 {
-    return (i >= 0 && i < bildAnzahl) ? bilder[i] : 0;
+    return (i >= 0 && i < imageCount) ? bilder[i] : 0;
 }
 
-int Animation2DData::getImageAnzahl() const
+int Animation2DData::getImageCount() const
 {
-    return bildAnzahl;
+    return imageCount;
 }
 
 int Animation2DData::getFPS() const
@@ -178,12 +178,12 @@ int Animation2DData::getFPS() const
     return fps;
 }
 
-bool Animation2DData::istWiederhohlend() const
+bool Animation2DData::isRepeating() const
 {
     return wiederhohlen;
 }
 
-bool Animation2DData::istTransparent() const
+bool Animation2DData::isTransparent() const
 {
     return transparent;
 }
@@ -197,10 +197,10 @@ Animation2D::Animation2D()
       ausgleich(0),
       alpha(0),
       maxAlpha(255),
-      rahmen(0),
+      border(0),
       ram(0),
       aps(255 * 60),
-      sichtbar(0)
+      visible(0)
 {}
 
 // Destructor
@@ -213,7 +213,7 @@ Animation2D::~Animation2D()
 // non-constant
 void Animation2D::setBorder(bool ram)
 {
-    rahmen = ram;
+    border = ram;
 }
 
 void Animation2D::setBorderZ(Border* ram)
@@ -225,13 +225,13 @@ void Animation2D::setBorderZ(Border* ram)
 void Animation2D::setBorderWidth(int br)
 {
     if (!ram) ram = new LBorder();
-    ram->setRamenBreite(br);
+    ram->setBorderWidth(br);
 }
 
 void Animation2D::setBorderColor(int f)
 {
     if (!ram) ram = new LBorder();
-    ram->setFarbe(f);
+    ram->setColor(f);
 }
 
 void Animation2D::setAnimationDataZ(Animation2DData* data)
@@ -253,22 +253,22 @@ void Animation2D::setAPS(int aps)
     this->aps = aps;
 }
 
-void Animation2D::setSichtbar(bool sichtbar)
+void Animation2D::setVisible(bool visible)
 {
-    this->sichtbar = sichtbar;
+    this->visible = visible;
 }
 
 bool Animation2D::tick(double zeit)
 {
     lockDrawable();
-    if (!data || (!alpha && !sichtbar))
+    if (!data || (!alpha && !visible))
     {
         bool ret = rend;
         rend = 0;
         unlockDrawable();
         return ret;
     }
-    if (sichtbar && alpha < maxAlpha)
+    if (visible && alpha < maxAlpha)
     {
         if (alpha + aps * zeit >= maxAlpha)
             alpha = maxAlpha;
@@ -276,7 +276,7 @@ bool Animation2D::tick(double zeit)
             alpha = (unsigned char)(alpha + aps * zeit);
         rend = 1;
     }
-    else if (!sichtbar && alpha > 0)
+    else if (!visible && alpha > 0)
     {
         if (alpha - aps * zeit <= 0)
             alpha = 0;
@@ -291,12 +291,12 @@ bool Animation2D::tick(double zeit)
     {
         ausgleich -= 1.0 / data->getFPS();
         ++jetzt;
-        if (jetzt >= data->getImageAnzahl())
+        if (jetzt >= data->getImageCount())
         {
-            if (data->istWiederhohlend())
+            if (data->isRepeating())
                 jetzt = 0;
             else
-                jetzt = data->getImageAnzahl();
+                jetzt = data->getImageCount();
         }
     }
     data->unlock();
@@ -318,11 +318,11 @@ void Animation2D::render(Image& zRObj)
     if (data->zImage(jetzt))
     {
         zRObj.setAlpha(alpha);
-        if (data->istTransparent())
+        if (data->isTransparent())
             zRObj.alphaImage(pos.x, pos.y, gr.x, gr.y, *data->zImage(jetzt));
         else
             zRObj.drawImage(pos.x, pos.y, gr.x, gr.y, *data->zImage(jetzt));
-        if (ram && rahmen)
+        if (ram && border)
         {
             ram->setPosition(pos);
             ram->setSize(gr);
@@ -345,9 +345,9 @@ Animation2DData* Animation2D::zAnimationData() const
     return data;
 }
 
-bool Animation2D::istSichtbar() const
+bool Animation2D::isVisible() const
 {
-    return sichtbar;
+    return visible;
 }
 
 int Animation2D::getJetzt() const
@@ -360,9 +360,9 @@ unsigned char Animation2D::getAlphaMaske() const
     return maxAlpha;
 }
 
-bool Animation2D::hatRahmen() const
+bool Animation2D::hasBorder() const
 {
-    return rahmen;
+    return border;
 }
 
 Border* Animation2D::getBorder() const
@@ -377,15 +377,15 @@ Border* Animation2D::zBorder() const
 
 int Animation2D::getBorderWidth() const
 {
-    return ram ? ram->getRBreite() : 0;
+    return ram ? ram->getRWidth() : 0;
 }
 
 int Animation2D::getBorderColor() const
 {
-    return ram ? ram->getFarbe() : 0;
+    return ram ? ram->getColor() : 0;
 }
 
-Drawable* Animation2D::dublizieren() const
+Drawable* Animation2D::duplicate() const
 {
     Animation2D* ret = new Animation2D();
     ret->setPosition(pos);
@@ -394,17 +394,17 @@ Drawable* Animation2D::dublizieren() const
     ret->setKeyboardEventParameter(takParam);
     ret->setMouseEvent(mak);
     ret->setKeyboardEvent(tak);
-    if (toolTip) ret->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) ret->setToolTipZ((ToolTip*)toolTip->duplicate());
     if (data)
         ret->setAnimationDataZ(dynamic_cast<Animation2DData*>(data->getThis()));
     ret->setAPS(aps);
-    ret->setSichtbar(sichtbar);
+    ret->setVisible(visible);
     ret->setAlphaMaske(maxAlpha);
-    ret->setBorder(rahmen);
+    ret->setBorder(border);
     if (ram)
     {
-        ret->setBorderWidth(ram->getRBreite());
-        ret->setBorderColor(ram->getFarbe());
+        ret->setBorderWidth(ram->getRWidth());
+        ret->setBorderColor(ram->getColor());
     }
     return ret;
 }

Animation.h

@@ -16,7 +16,7 @@ namespace Framework
     {
     private:
         Image** bilder;
-        int bildAnzahl;
+        int imageCount;
         int fps;
         bool wiederhohlen;
         bool transparent;
@@ -43,10 +43,10 @@ namespace Framework
         //!           x=a.ltdb\aaaa.jpg
         //!           y=a.ltdb\aaab.jpg
         //! \param datei The already loaded InitFile
-        DLLEXPORT void ladeAnimation(InitFile* datei);
+        DLLEXPORT void loadAnimation(InitFile* datei);
         //! Loads all images from an LTDB file in the order they are stored.
         //! \param datei The LTDB file
-        DLLEXPORT void ladeAnimation(LTDBFile* datei);
+        DLLEXPORT void loadAnimation(LTDBFile* datei);
         //! Sets the frames per second of the video animation
         //! \param fps The number of frames per second
         DLLEXPORT void setFPS(int fps);
@@ -67,14 +67,14 @@ namespace Framework
         //! \param i The index of the image
         DLLEXPORT Image* zImage(int i) const;
         //! Returns the number of images in the animation
-        DLLEXPORT int getImageAnzahl() const;
+        DLLEXPORT int getImageCount() const;
         //! Returns the number of frames per second
         DLLEXPORT int getFPS() const;
         //! Returns whether the animation repeats when it reaches the last
         //! image
-        DLLEXPORT bool istWiederhohlend() const;
+        DLLEXPORT bool isRepeating() const;
         //! Returns whether alpha blending is used when drawing the images
-        DLLEXPORT bool istTransparent() const;
+        DLLEXPORT bool isTransparent() const;
     };
 
     //! A drawing that renders a video animation
@@ -86,10 +86,10 @@ namespace Framework
         double ausgleich;
         unsigned char alpha;
         unsigned char maxAlpha;
-        bool rahmen;
+        bool border;
         Border* ram;
         int aps;
-        bool sichtbar;
+        bool visible;
 
     public:
         //! Constructor
@@ -118,9 +118,9 @@ namespace Framework
         //! \param aps Alpha per second
         DLLEXPORT void setAPS(int aps);
         //! Sets the visibility of the animation
-        //! \param sichtbar 1 if the animation should be shown, 0 if it should
+        //! \param visible 1 if the animation should be shown, 0 if it should
         //! be hidden
-        DLLEXPORT void setSichtbar(bool sichtbar);
+        DLLEXPORT void setVisible(bool visible);
         //! Processes the time that has passed since the last call of this
         //! function
         //! \param zeit The elapsed time in seconds
@@ -133,13 +133,13 @@ namespace Framework
         //! Returns the animation data without increasing the reference counter
         DLLEXPORT Animation2DData* zAnimationData() const;
         //! Returns whether the animation is visible
-        DLLEXPORT bool istSichtbar() const;
+        DLLEXPORT bool isVisible() const;
         //! Returns the index of the currently displayed image
         DLLEXPORT int getJetzt() const;
         //! Returns the transparency of the animation
         DLLEXPORT unsigned char getAlphaMaske() const;
         //! Returns whether a border is drawn around the animation
-        DLLEXPORT bool hatRahmen() const;
+        DLLEXPORT bool hasBorder() const;
         //! Returns the border of the animation
         DLLEXPORT Border* getBorder() const;
         //! Returns the border of the animation without increasing the
@@ -151,7 +151,7 @@ namespace Framework
         DLLEXPORT int getBorderColor() const;
         //! Copies the animation so that it can be modified without
         //! affecting the original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 } // namespace Framework
 

Array.h

@@ -273,7 +273,7 @@ namespace Framework
         //! Clears and deletes the linked list
         ~Array()
         {
-            leeren();
+            clear();
             delete entries;
         }
 
@@ -398,7 +398,7 @@ namespace Framework
         //! Swaps two elements in the list
         //! \param vi The index of the first element
         //! \param ni The index of the second element
-        void tausch(int vi, int ni)
+        void swap(int vi, int ni)
         {
             TYP tmp = get(ni);
             set(get(vi), ni);
@@ -406,7 +406,7 @@ namespace Framework
         }
 
         //! Deletes all elements of the list
-        void leeren()
+        void clear()
         {
             ArrayEntry<TYP>* e2 = 0;
             for (ArrayEntry<TYP>* e = entries->next; e; e = e->next)
@@ -456,14 +456,14 @@ namespace Framework
         //! Checks whether an element exists in the list
         //! \param i The index of the sought element
         //! \return (true) if the index exists. (false) otherwise
-        bool hat(int i) const
+        bool has(int i) const
         {
             return i >= 0 && i < count;
         }
 
         //! Returns the index of a value
         //! \param t The value to search for
-        int getWertIndex(TYP t) const
+        int getValueIndex(TYP t) const
         {
             int ret = 0;
             for (ArrayEntry<TYP>* e = entries; e; e = e->next)
@@ -505,7 +505,7 @@ namespace Framework
 
         Array& operator=(const Array& arr)
         {
-            leeren();
+            clear();
             int anz = arr.getEntryCount();
             for (int i = 0; i < anz; i++)
                 add(arr.get(i));
@@ -584,7 +584,7 @@ namespace Framework
         //! Clears and deletes the linked list
         ~RCArray()
         {
-            leeren();
+            clear();
             delete entries;
         }
 
@@ -699,7 +699,7 @@ namespace Framework
         //! Swaps two elements in the list
         //! \param vi The index of the first element
         //! \param ni The index of the second element
-        void tausch(int vi, int ni)
+        void swap(int vi, int ni)
         {
             if (vi < 0 || ni < 0) return;
             TYP* tmp = get(ni);
@@ -708,7 +708,7 @@ namespace Framework
         }
 
         //! Deletes all elements of the list
-        void leeren()
+        void clear()
         {
             for (ArrayEntry<TYP*>* e = entries->next; e;)
             {
@@ -780,7 +780,7 @@ namespace Framework
         //! Checks whether an element exists in the list
         //! \param i The index of the sought element
         //! \return (true) if the index exists. (false) otherwise
-        bool hat(int i) const
+        bool has(int i) const
         {
             return i >= 0 && i < count;
         }
@@ -829,7 +829,7 @@ namespace Framework
 
         RCArray& operator=(const RCArray& arr)
         {
-            leeren();
+            clear();
             int anz = arr.getEntryCount();
             for (int i = 0; i < anz; i++)
                 add(arr.get(i));

Assembly.cpp

@@ -55,13 +55,13 @@ struct MachineCodeInstruction
         if (operandSizeOverride)
         {
             char prefix = *(char*)&operandSizeOverride;
-            writer.schreibe(&prefix, 1);
+            writer.write(&prefix, 1);
         }
         if (needsRex && !needsVex)
         {
             char rex = 0b01000000 | ((exWE & 0b1) << 3) | ((exR & 0b1) << 2)
                      | ((exX & 0b1) << 1) | (exB & 0b1);
-            writer.schreibe(&rex, 1);
+            writer.write(&rex, 1);
         }
         int opCodeOffset = 0;
         if (needsVex)
@@ -93,7 +93,7 @@ struct MachineCodeInstruction
                 vex2[2] = ((exWE & 0b1) << 7)
                         | (((~(char)vexVVVV) & 0b1111) << 3)
                         | ((vexL & 0b1) << 2) | (vexPP & 0b11);
-                writer.schreibe(vex2, 3);
+                writer.write(vex2, 3);
             }
             else
             {
@@ -103,25 +103,25 @@ struct MachineCodeInstruction
                 vex2[1] = (((~(char)exR) & 0b1) << 7)
                         | (((~(char)vexVVVV) & 0b1111) << 3)
                         | ((vexL & 0b1) << 2) | (vexPP & 0b11);
-                writer.schreibe(vex2, 2);
+                writer.write(vex2, 2);
             }
         }
-        writer.schreibe(opcode + opCodeOffset, opcodeLength - opCodeOffset);
+        writer.write(opcode + opCodeOffset, opcodeLength - opCodeOffset);
         if (needsModRM)
         {
-            writer.schreibe(&modRM, 1);
+            writer.write(&modRM, 1);
         }
         if (sibNeeded)
         {
-            writer.schreibe(&sib, 1);
+            writer.write(&sib, 1);
         }
         if (dispLength > 0)
         {
-            writer.schreibe(disp, dispLength);
+            writer.write(disp, dispLength);
         }
         if (immLength > 0)
         {
-            writer.schreibe(imm, immLength);
+            writer.write(imm, immLength);
         }
     }
 
@@ -7353,7 +7353,7 @@ Framework::Assembly::Instruction::getOperation() const
 bool Framework::Assembly::Instruction::definesLabel(Text label) const
 {
     return op == NOP && args.size() == 1 && args.at(0)->asJumpTargetArgument()
-        && args.at(0)->asJumpTargetArgument()->getLabel().istGleich(label);
+        && args.at(0)->asJumpTargetArgument()->getLabel().isEqual(label);
 }
 
 const std::vector<Framework::Assembly::OperationArgument*>&
@@ -8294,7 +8294,7 @@ void Framework::Assembly::AssemblyBlock::optimize()
         }
         optimizedInstructions.add(dynamic_cast<Instruction*>(curr->getThis()));
     }
-    instructions.leeren();
+    instructions.clear();
     for (Instruction* instr : optimizedInstructions)
     {
         instructions.add(dynamic_cast<Instruction*>(instr->getThis()));
@@ -8393,7 +8393,7 @@ void* Framework::Assembly::AssemblyBlock::compile()
         throw std::runtime_error("Failed to allocate executable memory.");
     }
     // Write the compiled code into the allocated memory
-    buffer.lese((char*)compiledCode, totalSize);
+    buffer.read((char*)compiledCode, totalSize);
     DWORD dummy;
     VirtualProtect(compiledCode, totalSize, PAGE_EXECUTE_READ, &dummy);
     return compiledCode;

Base64.cpp

@@ -1,4 +1,4 @@
-#include "Base64.h"
+#include "Base64.h"
 
 using namespace Framework;
 
@@ -62,7 +62,7 @@ bool Framework::base64Decode(Text base64, char** data, int* length)
     while (base64[l])
     {
         if (base64[l] == '=') break;
-        if (!base64_chars.hat(base64[l])) return false;
+        if (!base64_chars.has(base64[l])) return false;
         l++;
     }
     *length = (l * 3) / 4;
@@ -73,7 +73,7 @@ bool Framework::base64Decode(Text base64, char** data, int* length)
         if (i == 4)
         {
             for (i = 0; i < 4; i++)
-                char_array_4[i] = (unsigned char)(base64_chars.positionVon(
+                char_array_4[i] = (unsigned char)(base64_chars.positionOf(
                     char_array_4[i]));
             char_array_3[0]
                 = (unsigned char)((char_array_4[0] << 2)
@@ -95,7 +95,7 @@ bool Framework::base64Decode(Text base64, char** data, int* length)
             char_array_4[j] = 0;
         for (j = 0; j < 4; j++)
             char_array_4[j]
-                = (unsigned char)(base64_chars.positionVon(char_array_4[j]));
+                = (unsigned char)(base64_chars.positionOf(char_array_4[j]));
         char_array_3[0] = (unsigned char)((char_array_4[0] << 2)
                                           + ((char_array_4[1] & 0x30) >> 4));
         char_array_3[1] = (unsigned char)(((char_array_4[1] & 0xf) << 4)

Border.cpp

@@ -13,7 +13,7 @@ using namespace Framework;
 Border::Border()
     : Drawable(),
       br(1),
-      farbe(0xFF000000),
+      color(0xFF000000),
       alpha(0),
       breaks(0)
 {}
@@ -22,7 +22,7 @@ Border::Border()
 Border::~Border() {}
 
 // non-constant
-void Border::setRamenBreite(int br) // sets the width of the border
+void Border::setBorderWidth(int br) // sets the width of the border
 {
     this->br = br;
     rend = 1;
@@ -46,24 +46,24 @@ void Border::setAlpha(
     rend = 1;
 }
 
-void Border::setFarbe(int f) // Sets the color of the border
+void Border::setColor(int f) // Sets the color of the border
 {
-    farbe = f;
+    color = f;
     rend = 1;
 }
 
-int Border::getFarbe() const // Returns the color of the border
+int Border::getColor() const // Returns the color of the border
 {
-    return farbe;
+    return color;
 }
 
-bool Border::hatAlpha()
+bool Border::hasAlpha()
     const // Returns whether the alpha value of the color is considered
 {
     return alpha;
 }
 
-int Border::getRBreite() const // Returns the width of the border
+int Border::getRWidth() const // Returns the width of the border
 {
     return br;
 }
@@ -115,20 +115,20 @@ void LBorder::render(Image& Obj) // Draws the border into the render object
         {
             for (int i = 0; i < br; ++i)
             {
-                Obj.drawLinieHAlpha(x + i + 1, y + i, gr.x - i * 2 - 1, farbe);
-                Obj.drawLinieVAlpha(b - i, y + i + 1, gr.y - i * 2 - 2, farbe);
-                Obj.drawLinieHAlpha(x + i + 1, h - i, gr.x - i * 2 - 1, farbe);
-                Obj.drawLinieVAlpha(x + i, y + i, gr.y - i * 2, farbe);
+                Obj.drawLineHAlpha(x + i + 1, y + i, gr.x - i * 2 - 1, color);
+                Obj.drawLineVAlpha(b - i, y + i + 1, gr.y - i * 2 - 2, color);
+                Obj.drawLineHAlpha(x + i + 1, h - i, gr.x - i * 2 - 1, color);
+                Obj.drawLineVAlpha(x + i, y + i, gr.y - i * 2, color);
             }
         }
         else
         {
             for (int i = 0; i < br; ++i)
             {
-                Obj.drawLinieH(x + i + 1, y + i, gr.x - i * 2 - 1, farbe);
-                Obj.drawLinieV(b - i, y + i + 1, gr.y - i * 2 - 2, farbe);
-                Obj.drawLinieH(x + i + 1, h - i, gr.x - i * 2 - 1, farbe);
-                Obj.drawLinieV(x + i, y + i, gr.y - i * 2, farbe);
+                Obj.drawLineH(x + i + 1, y + i, gr.x - i * 2 - 1, color);
+                Obj.drawLineV(b - i, y + i + 1, gr.y - i * 2 - 2, color);
+                Obj.drawLineH(x + i + 1, h - i, gr.x - i * 2 - 1, color);
+                Obj.drawLineV(x + i, y + i, gr.y - i * 2, color);
             }
         }
     }
@@ -140,35 +140,35 @@ void LBorder::render(Image& Obj) // Draws the border into the render object
             {
                 for (int x = breakOffset; x < gr.x;
                     x += lineLength + breakLength)
-                    Obj.drawLinieHAlpha(x + i + 1,
+                    Obj.drawLineHAlpha(x + i + 1,
                         y + i,
                         lineLength
                             - (x + i + 1 + lineLength > gr.x - i - 1
                                     ? gr.x - i - 1 - (x + i + 1 + lineLength)
                                     : 0),
-                        farbe);
+                        color);
                 for (int x = gr.x - breakOffset - lineLength; x >= 0;
                     x -= lineLength + breakLength)
-                    Obj.drawLinieHAlpha(MAX(x + i + 1, i + 1),
+                    Obj.drawLineHAlpha(MAX(x + i + 1, i + 1),
                         h - i,
                         lineLength
                             - (x + i + 1 < i + 1 ? i + 1 - (x + i + 1) : 0),
-                        farbe);
+                        color);
                 for (int y = breakOffset; y < gr.y;
                     y += lineLength + breakLength)
-                    Obj.drawLinieVAlpha(b - i,
+                    Obj.drawLineVAlpha(b - i,
                         y + i + 1,
                         lineLength
                             - (y + i + 1 + lineLength > gr.y - i - 1
                                     ? gr.y - i - 1 - (y + i + 1 + lineLength)
                                     : 0),
-                        farbe);
+                        color);
                 for (int y = gr.y - breakOffset - lineLength; y >= 0;
                     y -= lineLength + breakLength)
-                    Obj.drawLinieVAlpha(x + i,
+                    Obj.drawLineVAlpha(x + i,
                         MAX(y + i, i),
                         lineLength - (y + i < i ? i - (y + i) : 0),
-                        farbe);
+                        color);
             }
         }
         else
@@ -177,42 +177,42 @@ void LBorder::render(Image& Obj) // Draws the border into the render object
             {
                 for (int x = breakOffset; x < gr.x;
                     x += lineLength + breakLength)
-                    Obj.drawLinieH(x + i + 1,
+                    Obj.drawLineH(x + i + 1,
                         y + i,
                         lineLength
                             - (x + i + 1 + lineLength > gr.x - i - 1
                                     ? gr.x - i - 1 - (x + i + 1 + lineLength)
                                     : 0),
-                        farbe);
+                        color);
                 for (int x = gr.x - breakOffset - lineLength; x >= 0;
                     x -= lineLength + breakLength)
-                    Obj.drawLinieH(MAX(x + i + 1, i + 1),
+                    Obj.drawLineH(MAX(x + i + 1, i + 1),
                         h - i,
                         lineLength
                             - (x + i + 1 < i + 1 ? i + 1 - (x + i + 1) : 0),
-                        farbe);
+                        color);
                 for (int y = breakOffset; y < gr.y;
                     y += lineLength + breakLength)
-                    Obj.drawLinieV(b - i,
+                    Obj.drawLineV(b - i,
                         y + i + 1,
                         lineLength
                             - (y + i + 1 + lineLength > gr.y - i - 1
                                     ? gr.y - i - 1 - (y + i + 1 + lineLength)
                                     : 0),
-                        farbe);
+                        color);
                 for (int y = gr.y - breakOffset - lineLength; y >= 0;
                     y -= lineLength + breakLength)
-                    Obj.drawLinieV(x + i,
+                    Obj.drawLineV(x + i,
                         MAX(y + i, i),
                         lineLength - (y + i < i ? i - (y + i) : 0),
-                        farbe);
+                        color);
             }
         }
     }
     Obj.releaseDrawOptions();
 }
 
-Drawable* LBorder::dublizieren() const // Copies the drawing
+Drawable* LBorder::duplicate() const // Copies the drawing
 {
     Border* obj = new LBorder();
     obj->setPosition(pos);
@@ -221,11 +221,11 @@ Drawable* LBorder::dublizieren() const // Copies the drawing
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setBreaks(breaks);
     obj->setAlpha(alpha);
-    obj->setFarbe(farbe);
-    obj->setRamenBreite(br);
+    obj->setColor(color);
+    obj->setBorderWidth(br);
     return obj;
 }
 
@@ -235,7 +235,7 @@ Border3D::Border3D()
     : Border()
 {
     alpha = 1;
-    farbe = 0x70FFFFFF;
+    color = 0x70FFFFFF;
     br = 5;
 }
 
@@ -249,7 +249,7 @@ void Border3D::render(Image& Obj) // Draws the border into the render object
     int y = 0;
     int b = gr.x - 1;
     int h = gr.y - 1;
-    int fcomp = (farbe & 0xFF000000) | (~farbe & 0x00FFFFFF);
+    int fcomp = (color & 0xFF000000) | (~color & 0x00FFFFFF);
     if (!Obj.setDrawOptions(pos.x, pos.y, gr.x, gr.y)) return;
     if (!breaks)
     {
@@ -257,20 +257,20 @@ void Border3D::render(Image& Obj) // Draws the border into the render object
         {
             for (int i = 0; i < br; ++i)
             {
-                Obj.drawLinieHAlpha(x + i + 1, y + i, gr.x - i * 2 - 1, farbe);
-                Obj.drawLinieVAlpha(b - i, y + i + 1, gr.y - i * 2 - 2, farbe);
-                Obj.drawLinieHAlpha(x + i + 1, h - i, gr.x - i * 2 - 1, fcomp);
-                Obj.drawLinieVAlpha(x + i, y + i, gr.y - i * 2, fcomp);
+                Obj.drawLineHAlpha(x + i + 1, y + i, gr.x - i * 2 - 1, color);
+                Obj.drawLineVAlpha(b - i, y + i + 1, gr.y - i * 2 - 2, color);
+                Obj.drawLineHAlpha(x + i + 1, h - i, gr.x - i * 2 - 1, fcomp);
+                Obj.drawLineVAlpha(x + i, y + i, gr.y - i * 2, fcomp);
             }
         }
         else
         {
             for (int i = 0; i < br; ++i)
             {
-                Obj.drawLinieH(x + i + 1, y + i, gr.x - i * 2 - 1, farbe);
-                Obj.drawLinieV(b - i, y + i + 1, gr.y - i * 2 - 2, farbe);
-                Obj.drawLinieH(x + i + 1, h - i, gr.x - i * 2 - 1, fcomp);
-                Obj.drawLinieV(x + i, y + i, gr.y - i * 2, fcomp);
+                Obj.drawLineH(x + i + 1, y + i, gr.x - i * 2 - 1, color);
+                Obj.drawLineV(b - i, y + i + 1, gr.y - i * 2 - 2, color);
+                Obj.drawLineH(x + i + 1, h - i, gr.x - i * 2 - 1, fcomp);
+                Obj.drawLineV(x + i, y + i, gr.y - i * 2, fcomp);
             }
         }
     }
@@ -282,32 +282,32 @@ void Border3D::render(Image& Obj) // Draws the border into the render object
             {
                 for (int x = breakOffset; x < gr.x;
                     x += lineLength + breakLength)
-                    Obj.drawLinieHAlpha(x + i + 1,
+                    Obj.drawLineHAlpha(x + i + 1,
                         y + i,
                         lineLength
                             - (x + i + 1 + lineLength > gr.x - i - 1
                                     ? gr.x - i - 1 - (x + i + 1 + lineLength)
                                     : 0),
-                        farbe);
+                        color);
                 for (int x = gr.x - breakOffset - lineLength; x >= 0;
                     x -= lineLength + breakLength)
-                    Obj.drawLinieHAlpha(MAX(x + i + 1, i + 1),
+                    Obj.drawLineHAlpha(MAX(x + i + 1, i + 1),
                         h - i,
                         lineLength
                             - (x + i + 1 < i + 1 ? i + 1 - (x + i + 1) : 0),
                         fcomp);
                 for (int y = breakOffset; y < gr.y;
                     y += lineLength + breakLength)
-                    Obj.drawLinieVAlpha(b - i,
+                    Obj.drawLineVAlpha(b - i,
                         y + i + 1,
                         lineLength
                             - (y + i + 1 + lineLength > gr.y - i - 1
                                     ? gr.y - i - 1 - (y + i + 1 + lineLength)
                                     : 0),
-                        farbe);
+                        color);
                 for (int y = gr.y - breakOffset - lineLength; y >= 0;
                     y -= lineLength + breakLength)
-                    Obj.drawLinieVAlpha(x + i,
+                    Obj.drawLineVAlpha(x + i,
                         MAX(y + i, i),
                         lineLength - (y + i < i ? i - (y + i) : 0),
                         fcomp);
@@ -319,32 +319,32 @@ void Border3D::render(Image& Obj) // Draws the border into the render object
             {
                 for (int x = breakOffset; x < gr.x;
                     x += lineLength + breakLength)
-                    Obj.drawLinieH(x + i + 1,
+                    Obj.drawLineH(x + i + 1,
                         y + i,
                         lineLength
                             - (x + i + 1 + lineLength > gr.x - i - 1
                                     ? gr.x - i - 1 - (x + i + 1 + lineLength)
                                     : 0),
-                        farbe);
+                        color);
                 for (int x = gr.x - breakOffset - lineLength; x >= 0;
                     x -= lineLength + breakLength)
-                    Obj.drawLinieH(MAX(x + i + 1, i + 1),
+                    Obj.drawLineH(MAX(x + i + 1, i + 1),
                         h - i,
                         lineLength
                             - (x + i + 1 < i + 1 ? i + 1 - (x + i + 1) : 0),
                         fcomp);
                 for (int y = breakOffset; y < gr.y;
                     y += lineLength + breakLength)
-                    Obj.drawLinieV(b - i,
+                    Obj.drawLineV(b - i,
                         y + i + 1,
                         lineLength
                             - (y + i + 1 + lineLength > gr.y - i - 1
                                     ? gr.y - i - 1 - (y + i + 1 + lineLength)
                                     : 0),
-                        farbe);
+                        color);
                 for (int y = gr.y - breakOffset - lineLength; y >= 0;
                     y -= lineLength + breakLength)
-                    Obj.drawLinieV(x + i,
+                    Obj.drawLineV(x + i,
                         MAX(y + i, i),
                         lineLength - (y + i < i ? i - (y + i) : 0),
                         fcomp);
@@ -354,7 +354,7 @@ void Border3D::render(Image& Obj) // Draws the border into the render object
     Obj.releaseDrawOptions();
 }
 
-Drawable* Border3D::dublizieren() const // Copies the drawing
+Drawable* Border3D::duplicate() const // Copies the drawing
 {
     Border* obj = new Border3D();
     obj->setPosition(pos);
@@ -363,10 +363,10 @@ Drawable* Border3D::dublizieren() const // Copies the drawing
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setBreaks(breaks);
     obj->setAlpha(alpha);
-    obj->setFarbe(farbe);
-    obj->setRamenBreite(br);
+    obj->setColor(color);
+    obj->setBorderWidth(br);
     return obj;
 }

Border.h

@@ -1,5 +1,5 @@
-#ifndef Rahmen_H
-#define Rahmen_H
+#ifndef Border_H
+#define Border_H
 
 #include "Drawing.h"
 
@@ -11,7 +11,7 @@ namespace Framework
     {
     protected:
         int br;
-        int farbe;
+        int color;
         bool alpha;
         bool breaks;
         int breakOffset;
@@ -25,7 +25,7 @@ namespace Framework
         DLLEXPORT virtual ~Border();
         //! Sets the width of the border
         //! \param br The width in pixels
-        DLLEXPORT void setRamenBreite(int br);
+        DLLEXPORT void setBorderWidth(int br);
         //! If this flag is set, the border is drawn dashed
         //! \param br 1 -> dashed, 0 -> solid
         //! \param brOff Starting point of the first line segment
@@ -34,17 +34,17 @@ namespace Framework
         DLLEXPORT void setBreaks(
             bool br, int brOff = 0, int brLength = 10, int lineLength = 10);
         //! Returns the width of the border in pixels
-        DLLEXPORT int getRBreite() const;
+        DLLEXPORT int getRWidth() const;
         //! Sets whether alpha blending should be used when drawing
         //! \param a 1 if alpha blending should be used
         DLLEXPORT void setAlpha(bool a);
         //! Sets the color of the border
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setFarbe(int f);
+        DLLEXPORT void setColor(int f);
         //! Returns the color of the border in A8R8G8B8 format
-        DLLEXPORT int getFarbe() const;
+        DLLEXPORT int getColor() const;
         //! Returns whether the border is drawn with alpha blending
-        DLLEXPORT bool hatAlpha() const;
+        DLLEXPORT bool hasAlpha() const;
         //! Returns 1 if the border is drawn dashed
         DLLEXPORT bool hasBreaks() const;
         //! Starting point of the first line segment
@@ -71,7 +71,7 @@ namespace Framework
         DLLEXPORT void render(Image& zRObj) override;
         //! Copies the border so that it can be modified without affecting
         //! the original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 
     class Border3D : public Border
@@ -86,7 +86,7 @@ namespace Framework
         DLLEXPORT void render(Image& zRObj) override;
         //! Copies the border so that it can be modified without affecting
         //! the original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 } // namespace Framework
 

Button.cpp

@@ -19,21 +19,21 @@ using namespace Framework;
 // Constructor
 Button::Button()
     : TextField(),
-      klickFarbe(0xFF000000),
-      klickImage(0),
+      klickColor(0xFF000000),
+      clickImage(0),
       klickBuffer(0),
       klickIndex(0)
 {
     style
-        = Style::Erlaubt | Style::Buffered | Style::KlickBuffer | Style::Border;
+        = Style::Allowed | Style::Buffered | Style::ClickBuffer | Style::Border;
     this->setMouseEvent(_ret1ME);
-    setSchriftFarbe(0xFFFFFFFF);
-    setSchriftSize(12);
+    setFontColor(0xFFFFFFFF);
+    setFontSize(12);
     setBorderWidth(2);
     setBorderColor(0xFF00FF00);
     setAlphaFieldColor(0x5500FF00);
     setAlphaFieldStrength(-5);
-    setKBFarbe(0xFF000000);
+    setKBColor(0xFF000000);
     setKBStrength(20);
     addStyle(TextField::Style::Center);
 }
@@ -42,59 +42,59 @@ Button::Button()
 Button::~Button()
 {
     if (klickBuffer) klickBuffer->release();
-    if (klickImage) klickImage->release();
+    if (clickImage) clickImage->release();
 }
 
 void Button::doMouseEvent(MouseEvent& me, bool userRet) // Mouse event
 {
-    if (hatStyleNicht(Style::Erlaubt) || !userRet) return;
-    if (me.id == ME_Betritt)
+    if (hasStyleNot(Style::Allowed) || !userRet) return;
+    if (me.id == ME_Enter)
     {
-        klickIndex = MausStand[M_Links];
+        klickIndex = MouseState[M_Left];
         if (klickIndex) rend = 1;
     }
-    if (me.id == ME_RLinks || me.id == ME_Leaves)
+    if (me.id == ME_RLeft || me.id == ME_Leaves)
     {
         if (klickIndex) rend = 1;
         klickIndex = 0;
     }
-    if (!me.verarbeitet)
+    if (!me.processed)
     {
-        if (me.id == ME_PLinks)
+        if (me.id == ME_PLeft)
         {
             klickIndex = 1;
             rend = 1;
         }
-        me.verarbeitet = 1;
+        me.processed = 1;
     }
 }
 
 // non-constant
-void Button::setKlickFarbe(int fc) // sets the click color
+void Button::setClickColor(int fc) // sets the click color
 {
-    klickFarbe = fc;
+    klickColor = fc;
     rend = 1;
 }
 
-void Button::setKlickImage(Image* bild) // sets the click image
+void Button::setClickImage(Image* bild) // sets the click image
 {
     if (bild)
     {
-        if (!klickImage) klickImage = new Image();
-        klickImage->neuImage(bild->getBreite(), bild->getHeight(), 0);
-        int* buff1 = klickImage->getBuffer();
+        if (!clickImage) clickImage = new Image();
+        clickImage->newImage(bild->getWidth(), bild->getHeight(), 0);
+        int* buff1 = clickImage->getBuffer();
         int* buff2 = bild->getBuffer();
-        for (int i = 0; i < bild->getBreite() * bild->getHeight(); ++i)
+        for (int i = 0; i < bild->getWidth() * bild->getHeight(); ++i)
             buff1[i] = buff2[i];
         bild->release();
         rend = 1;
     }
 }
 
-void Button::setKlickImageZ(Image* bild) // sets a pointer to the click image
+void Button::setClickImageZ(Image* bild) // sets a pointer to the click image
 {
-    if (klickImage) klickImage->release();
-    klickImage = bild;
+    if (clickImage) clickImage->release();
+    clickImage = bild;
     rend = 1;
 }
 
@@ -112,10 +112,10 @@ void Button::setKBStrength(int st) // sets the click buffer strength
     rend = 1;
 }
 
-void Button::setKBFarbe(int fc) // sets the click buffer color
+void Button::setKBColor(int fc) // sets the click buffer color
 {
     if (!klickBuffer) klickBuffer = new AlphaField();
-    klickBuffer->setFarbe(fc);
+    klickBuffer->setColor(fc);
     rend = 1;
 }
 
@@ -125,41 +125,41 @@ void Button::doKeyboardEvent(KeyboardEvent& te) {}
 
 void Button::render(Image& zRObj) // renders int zRObj
 {
-    if (!hatStyle(Style::Sichtbar)) return;
+    if (!hasStyle(Style::Visible)) return;
     addStyle(TextField::Style::Center);
-    bool erlaubt = hatStyle(Style::Erlaubt);
+    bool erlaubt = hasStyle(Style::Allowed);
     bool rA = 0;
-    if (!hatStyle(Style::Erlaubt))
+    if (!hasStyle(Style::Allowed))
     {
         zRObj.setAlpha(0x20);
         rA = 1;
     }
     bool tmpRend = rend;
-    removeStyle(Style::VScroll | Style::HScroll | Style::Erlaubt);
+    removeStyle(Style::VScroll | Style::HScroll | Style::Allowed);
     TextField::render(zRObj);
     if (!zRObj.setDrawOptions(innenPosition, innenSize))
     {
         if (rA) zRObj.releaseAlpha();
-        setStyle(Style::Erlaubt, erlaubt);
+        setStyle(Style::Allowed, erlaubt);
         return;
     }
-    if (hatStyle(Style::Sichtbar) && klickIndex == 1)
+    if (hasStyle(Style::Visible) && klickIndex == 1)
     {
-        if (hatStyle(Style::KlickFarbe))
+        if (hasStyle(Style::ClickColor))
         {
-            if (hatStyle(Style::KlickAlpha))
-                zRObj.alphaRegion(0, 0, innenSize.x, innenSize.y, klickFarbe);
+            if (hasStyle(Style::ClickAlpha))
+                zRObj.alphaRegion(0, 0, innenSize.x, innenSize.y, klickColor);
             else
-                zRObj.fillRegion(0, 0, innenSize.x, innenSize.y, klickFarbe);
+                zRObj.fillRegion(0, 0, innenSize.x, innenSize.y, klickColor);
         }
-        if (hatStyle(Style::KlickImage) && klickImage)
+        if (hasStyle(Style::ClickImage) && clickImage)
         {
-            if (hatStyle(Style::KlickAlpha))
-                zRObj.alphaImage(0, 0, innenSize.x, innenSize.y, *klickImage);
+            if (hasStyle(Style::ClickAlpha))
+                zRObj.alphaImage(0, 0, innenSize.x, innenSize.y, *clickImage);
             else
-                zRObj.drawImage(0, 0, innenSize.x, innenSize.y, *klickImage);
+                zRObj.drawImage(0, 0, innenSize.x, innenSize.y, *clickImage);
         }
-        if (hatStyle(Style::KlickBuffer) && klickBuffer)
+        if (hasStyle(Style::ClickBuffer) && klickBuffer)
         {
             klickBuffer->setSize(innenSize.x, innenSize.y);
             klickBuffer->render(zRObj);
@@ -167,25 +167,25 @@ void Button::render(Image& zRObj) // renders int zRObj
     }
     if (rA) zRObj.releaseAlpha();
     zRObj.releaseDrawOptions();
-    setStyle(Style::Erlaubt, erlaubt);
+    setStyle(Style::Allowed, erlaubt);
     rend = tmpRend;
 }
 
 // constant
-int Button::getKlickFarbe() const // returns the click color
+int Button::getClickColor() const // returns the click color
 {
-    return klickFarbe;
+    return klickColor;
 }
 
-Image* Button::getKlickImage() const // returns the click image
+Image* Button::getClickImage() const // returns the click image
 {
-    if (!klickImage) return 0;
-    return dynamic_cast<Image*>(klickImage->getThis());
+    if (!clickImage) return 0;
+    return dynamic_cast<Image*>(clickImage->getThis());
 }
 
-Image* Button::zKlickImage() const // returns a pointer to the click image
+Image* Button::zClickImage() const // returns a pointer to the click image
 {
-    return klickImage;
+    return clickImage;
 }
 
 AlphaField* Button::getKB() const // returns the click buffer
@@ -200,10 +200,10 @@ Button::zKB() const // returns the click buffer without reference counter
     return klickBuffer;
 }
 
-int Button::getKBFarbe() const // returns the click buffer color
+int Button::getKBColor() const // returns the click buffer color
 {
     if (!klickBuffer) return 0;
-    return klickBuffer->getFarbe();
+    return klickBuffer->getColor();
 }
 
 int Button::getKBStrength() const // returns the click buffer strength
@@ -213,7 +213,7 @@ int Button::getKBStrength() const // returns the click buffer strength
 }
 
 Drawable*
-Button::dublizieren() const // creates a copy of the drawing and returns it
+Button::duplicate() const // creates a copy of the drawing and returns it
 {
     Button* obj = new Button();
     obj->setPosition(pos);
@@ -222,38 +222,38 @@ Button::dublizieren() const // creates a copy of the drawing and returns it
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setStyle(style);
-    obj->setSchriftSize(getSchriftSize());
+    obj->setFontSize(getFontSize());
     if (zFont()) obj->setFontZ(getFont());
     if (zText()) obj->setText(zText()->getText());
-    obj->setHintergrundFarbe(hintergrundFarbe);
-    obj->setSchriftFarbe(getSchriftFarbe());
-    if (hintergrundFeld)
-        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
-    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
-    if (hintergrundImage)
-        obj->setHintergrundImage(
-            dynamic_cast<Image*>(hintergrundImage->getThis()));
+    obj->setBackgroundColor(backgroundColor);
+    obj->setFontColor(getFontColor());
+    if (backgroundFeld)
+        obj->setAlphaFieldZ((AlphaField*)backgroundFeld->duplicate());
+    if (border) obj->setBorderZ((Border*)border->duplicate());
+    if (backgroundImage)
+        obj->setBackgroundImage(
+            dynamic_cast<Image*>(backgroundImage->getThis()));
     if (vertikalScrollBar)
     {
-        obj->setVertikalKlickScroll(vertikalScrollBar->getKlickScroll());
-        obj->setVertikalScrollPos(vertikalScrollBar->getScroll());
-        obj->setVertikalScrollFarbe(
-            vertikalScrollBar->getFarbe(), vertikalScrollBar->getBgFarbe());
+        obj->setVerticalClickScroll(vertikalScrollBar->getClickScroll());
+        obj->setVerticalScrollPos(vertikalScrollBar->getScroll());
+        obj->setVerticalScrollColor(
+            vertikalScrollBar->getColor(), vertikalScrollBar->getBgColor());
     }
     if (horizontalScrollBar)
     {
-        obj->setHorizontalKlickScroll(horizontalScrollBar->getKlickScroll());
+        obj->setHorizontalClickScroll(horizontalScrollBar->getClickScroll());
         obj->setHorizontalScrollPos(horizontalScrollBar->getScroll());
-        obj->setHorizontalScrollFarbe(
-            horizontalScrollBar->getFarbe(), horizontalScrollBar->getBgFarbe());
+        obj->setHorizontalScrollColor(
+            horizontalScrollBar->getColor(), horizontalScrollBar->getBgColor());
     }
     obj->setSchowChar(getShowChar());
-    // obj->setAuswahl( getSelectionPos(), getCursorPos() );
-    obj->setKlickFarbe(klickFarbe);
-    if (klickImage) obj->setKlickImage(dynamic_cast<Image*>(klickImage->getThis()));
-    if (klickBuffer) obj->setKBZ((AlphaField*)klickBuffer->dublizieren());
+    // obj->setSelection( getSelectionPos(), getCursorPos() );
+    obj->setClickColor(klickColor);
+    if (clickImage) obj->setClickImage(dynamic_cast<Image*>(clickImage->getThis()));
+    if (klickBuffer) obj->setKBZ((AlphaField*)klickBuffer->duplicate());
     return obj;
 }
 
@@ -275,8 +275,8 @@ CheckBox::CheckBox()
       sF(0xFFFFFFFF),
       sGr(12)
 {
-    style = Style::Erlaubt | Style::KlickBuffer;
-    setKAFFarbe(0x00007500);
+    style = Style::Allowed | Style::ClickBuffer;
+    setKAFColor(0x00007500);
     setKAFStrength(-30);
 }
 
@@ -297,17 +297,17 @@ CheckBox::~CheckBox()
 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;
-    if (me.id == ME_Betritt && hatStyle(Style::MausKlick) != MausStand[M_Links])
-        setStyle(Style::MausKlick, MausStand[M_Links]);
-    if (me.id == ME_PLinks) addStyle(Style::MausKlick);
-    if (me.id == ME_RLinks)
+    if (me.id == ME_Leaves || !userRet) style &= ~Style::MouseClick;
+    if (hasStyleNot(TextField::Style::Allowed) || !userRet) return;
+    if (me.id == ME_Enter && hasStyle(Style::MouseClick) != MouseState[M_Left])
+        setStyle(Style::MouseClick, MouseState[M_Left]);
+    if (me.id == ME_PLeft) addStyle(Style::MouseClick);
+    if (me.id == ME_RLeft)
     {
-        removeStyle(Style::MausKlick);
-        setStyle(Style::Selected, !hatStyle(Style::Selected));
+        removeStyle(Style::MouseClick);
+        setStyle(Style::Selected, !hasStyle(Style::Selected));
     }
-    me.verarbeitet = 1;
+    me.processed = 1;
 }
 
 // non-constant
@@ -361,16 +361,16 @@ void CheckBox::setTextRendererZ(TextRenderer* textRd)
     this->textRd = textRd;
 }
 
-void CheckBox::setFontZ(Font* schrift) // sets the font
+void CheckBox::setFontZ(Font* font) // sets the font
 {
     if (!this->textRd)
-        textRd = new TextRenderer(schrift);
+        textRd = new TextRenderer(font);
     else
-        textRd->setFontZ(schrift);
+        textRd->setFontZ(font);
     rend = 1;
 }
 
-void CheckBox::setSFarbe(int f) // sets the font color
+void CheckBox::setSColor(int f) // sets the font color
 {
     sF = f;
     rend = 1;
@@ -382,13 +382,13 @@ void CheckBox::setSSize(int gr) // sets the font size
     rend = 1;
 }
 
-void CheckBox::setSBgFarbe(int f) // sets the select background color
+void CheckBox::setSBgColor(int f) // sets the select background color
 {
     sBgF = f;
     rend = 1;
 }
 
-void CheckBox::setKBgFarbe(int f) // sets the click background color
+void CheckBox::setKBgColor(int f) // sets the click background color
 {
     kBgF = f;
     rend = 1;
@@ -404,8 +404,8 @@ void CheckBox::setSBgImageZ(Image* b) // sets the select background image
 void CheckBox::setSBgImage(Image* b)
 {
     if (!sBgB) sBgB = new Image();
-    sBgB->neuImage(b->getBreite(), b->getHeight(), 0);
-    sBgB->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
+    sBgB->newImage(b->getWidth(), b->getHeight(), 0);
+    sBgB->drawImage(0, 0, b->getWidth(), b->getHeight(), *b);
     b->release();
     rend = 1;
 }
@@ -420,8 +420,8 @@ void CheckBox::setKBgImageZ(Image* b) // sets the click background image
 void CheckBox::setKBgImage(Image* b)
 {
     if (!kBgB) kBgB = new Image();
-    kBgB->neuImage(b->getBreite(), b->getHeight(), 0);
-    kBgB->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
+    kBgB->newImage(b->getWidth(), b->getHeight(), 0);
+    kBgB->drawImage(0, 0, b->getWidth(), b->getHeight(), *b);
     b->release();
     rend = 1;
 }
@@ -433,10 +433,10 @@ void CheckBox::setSAlphaFieldZ(AlphaField* af) // sets the select AlphaField
     rend = 1;
 }
 
-void CheckBox::setSAFFarbe(int f) // sets the select AlphaField color
+void CheckBox::setSAFColor(int f) // sets the select AlphaField color
 {
     if (!sAf) sAf = new AlphaField();
-    sAf->setFarbe(f);
+    sAf->setColor(f);
     rend = 1;
 }
 
@@ -454,10 +454,10 @@ void CheckBox::setKAlphaFieldZ(AlphaField* af) // sets the click AlphaField
     rend = 1;
 }
 
-void CheckBox::setKAFFarbe(int f) // sets the click AlphaField color
+void CheckBox::setKAFColor(int f) // sets the click AlphaField color
 {
     if (!kAf) kAf = new AlphaField();
-    kAf->setFarbe(f);
+    kAf->setColor(f);
     rend = 1;
 }
 
@@ -471,19 +471,19 @@ void CheckBox::setKAFStrength(int st) // sets the click AlphaField strength
 void CheckBox::loadData(LTDBFile* dat) // loading the system images
 {
     if (FileExists(new Text("data/normal.ltdb"))
-        && (!dat || !dat->istOffen()))
+        && (!dat || !dat->isOpen()))
     {
         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"));
+        dat->readData(0);
+        kasten = dat->load(0, new Text("kasten.gif"));
+        sKasten = dat->load(0, new Text("skasten.gif"));
         dat->release();
     }
     else
     {
-        kasten = dat->laden(0, new Text("kasten.gif"));
-        sKasten = dat->laden(0, new Text("skasten.gif"));
+        kasten = dat->load(0, new Text("kasten.gif"));
+        sKasten = dat->load(0, new Text("skasten.gif"));
     }
     rend = 1;
 }
@@ -495,9 +495,9 @@ void CheckBox::loadData(
     {
         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"));
+        dat->readData(0);
+        kasten = dat->load(0, new Text("kasten.gif"));
+        sKasten = dat->load(0, new Text("skasten.gif"));
         dat->release();
         rend = 1;
     }
@@ -505,7 +505,7 @@ void CheckBox::loadData(
 
 void CheckBox::render(Image& zRObj) // renders into zRObj
 {
-    if (!hatStyle(Style::Sichtbar)) return;
+    if (!hasStyle(Style::Visible)) return;
     removeStyle(Style::VScroll | Style::HScroll);
     DrawableBackground::render(zRObj);
     lockDrawable();
@@ -514,29 +514,29 @@ void CheckBox::render(Image& zRObj) // renders into zRObj
         unlockDrawable();
         return;
     }
-    if (hatStyle(Style::MausKlick))
+    if (hasStyle(Style::MouseClick))
     {
-        if (hatStyle(Style::KlickFarbe))
+        if (hasStyle(Style::ClickColor))
         {
-            if (hatStyle(Style::KlickAlpha))
+            if (hasStyle(Style::ClickAlpha))
                 zRObj.alphaRegion(0, 0, innenSize.x, innenSize.y, kBgF);
             else
                 zRObj.fillRegion(0, 0, innenSize.x, innenSize.y, kBgF);
         }
-        if (hatStyle(Style::KlickImage) && kBgB)
+        if (hasStyle(Style::ClickImage) && kBgB)
         {
-            if (hatStyle(Style::KlickAlpha))
+            if (hasStyle(Style::ClickAlpha))
                 zRObj.alphaImage(0, 0, innenSize.x, innenSize.y, *kBgB);
             else
                 zRObj.drawImage(0, 0, innenSize.x, innenSize.y, *kBgB);
         }
-        if (hatStyle(Style::KlickBuffer) && kAf)
+        if (hasStyle(Style::ClickBuffer) && kAf)
         {
             kAf->setSize(innenSize.x, innenSize.y);
             kAf->render(zRObj);
         }
         int kbr = 0;
-        if (hatStyle(Style::Selected) && sKasten)
+        if (hasStyle(Style::Selected) && sKasten)
         {
             if (sTxt && textRd)
                 zRObj.drawImage(0,
@@ -547,17 +547,17 @@ void CheckBox::render(Image& zRObj) // renders into zRObj
                     innenSize.y,
                     *sKasten);
             else
-                zRObj.drawImage(gr.x / 2 - sKasten->getBreite() / 2,
+                zRObj.drawImage(gr.x / 2 - sKasten->getWidth() / 2,
                     (gr.y / 2 - sKasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - sKasten->getHeight() / 2),
                     innenSize.x,
                     innenSize.y,
                     *sKasten);
-            kbr = sKasten->getBreite();
+            kbr = sKasten->getWidth();
             if (sTxt && textRd)
             {
-                textRd->setSchriftSize(sGr);
+                textRd->setFontSize(sGr);
                 textRd->renderText(kbr + 5,
                     gr.y / 2 - textRd->getTextHeight(sTxt->getText()) / 2,
                     sTxt->getText(),
@@ -576,17 +576,17 @@ void CheckBox::render(Image& zRObj) // renders into zRObj
                     innenSize.y,
                     *kasten);
             else
-                zRObj.drawImage(gr.x / 2 - kasten->getBreite() / 2,
+                zRObj.drawImage(gr.x / 2 - kasten->getWidth() / 2,
                     (gr.y / 2 - kasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - kasten->getHeight() / 2),
                     innenSize.x,
                     innenSize.y,
                     *kasten);
-            kbr = kasten->getBreite();
+            kbr = kasten->getWidth();
             if (txt && textRd)
             {
-                textRd->setSchriftSize(sGr);
+                textRd->setFontSize(sGr);
                 textRd->renderText(kbr + 5,
                     gr.y / 2 - textRd->getTextHeight(txt->getText()) / 2,
                     txt->getText(),
@@ -595,23 +595,23 @@ void CheckBox::render(Image& zRObj) // renders into zRObj
             }
         }
     }
-    else if (hatStyle(Style::Selected))
+    else if (hasStyle(Style::Selected))
     {
-        if (hatStyle(Style::SelectFarbe))
+        if (hasStyle(Style::SelectColor))
         {
-            if (hatStyle(Style::SelectAlpha))
+            if (hasStyle(Style::SelectAlpha))
                 zRObj.alphaRegion(0, 0, innenSize.x, innenSize.y, sBgF);
             else
                 zRObj.fillRegion(0, 0, innenSize.x, innenSize.y, sBgF);
         }
-        if (hatStyle(Style::SelectImage) && sBgB)
+        if (hasStyle(Style::SelectImage) && sBgB)
         {
-            if (hatStyle(Style::SelectAlpha))
+            if (hasStyle(Style::SelectAlpha))
                 zRObj.alphaImage(0, 0, innenSize.x, innenSize.y, *sBgB);
             else
                 zRObj.drawImage(0, 0, innenSize.x, innenSize.y, *sBgB);
         }
-        if (hatStyle(Style::SelectBuffer) && sAf)
+        if (hasStyle(Style::SelectBuffer) && sAf)
         {
             sAf->setSize(innenSize.x, innenSize.y);
             sAf->render(zRObj);
@@ -628,18 +628,18 @@ void CheckBox::render(Image& zRObj) // renders into zRObj
                     innenSize.y,
                     *sKasten);
             else
-                zRObj.drawImage(gr.x / 2 - sKasten->getBreite() / 2,
+                zRObj.drawImage(gr.x / 2 - sKasten->getWidth() / 2,
                     (gr.y / 2 - sKasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - sKasten->getHeight() / 2),
                     innenSize.x,
                     innenSize.y,
                     *sKasten);
-            kbr = sKasten->getBreite();
+            kbr = sKasten->getWidth();
         }
         if (sTxt && textRd)
         {
-            textRd->setSchriftSize(sGr);
+            textRd->setFontSize(sGr);
             textRd->renderText(kbr + 5,
                 gr.y / 2 - textRd->getTextHeight(sTxt->getText()) / 2,
                 sTxt->getText(),
@@ -661,18 +661,18 @@ void CheckBox::render(Image& zRObj) // renders into zRObj
                     innenSize.y,
                     *kasten);
             else
-                zRObj.drawImage(gr.x / 2 - kasten->getBreite() / 2,
+                zRObj.drawImage(gr.x / 2 - kasten->getWidth() / 2,
                     (gr.y / 2 - kasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - kasten->getHeight() / 2),
                     innenSize.x,
                     innenSize.y,
                     *kasten);
-            kbr = kasten->getBreite();
+            kbr = kasten->getWidth();
         }
         if (txt && textRd)
         {
-            textRd->setSchriftSize(sGr);
+            textRd->setFontSize(sGr);
             textRd->renderText(kbr + 5,
                 gr.y / 2 - textRd->getTextHeight(txt->getText()) / 2,
                 txt->getText(),
@@ -715,7 +715,7 @@ Font* CheckBox::zFont() const
     return textRd ? textRd->zFont() : 0;
 }
 
-int CheckBox::getSFarbe() const // returns the font color
+int CheckBox::getSColor() const // returns the font color
 {
     return sF;
 }
@@ -725,12 +725,12 @@ int CheckBox::getSSize() const // returns the font size
     return sGr;
 }
 
-int CheckBox::getSBgFarbe() const // returns the select background color
+int CheckBox::getSBgColor() const // returns the select background color
 {
     return sBgF;
 }
 
-int CheckBox::getKBgFarbe() const // returns the click background color
+int CheckBox::getKBgColor() const // returns the click background color
 {
     return kBgF;
 }

Button.h

@@ -26,26 +26,26 @@ namespace Framework
             static const __int64 MehrfarbigText = 0x0010000;
             //! Specifies whether the button has a background color
             //! while being pressed
-            static const __int64 KlickFarbe = 0x0020000;
+            static const __int64 ClickColor = 0x0020000;
             //! Specifies whether the button has a background image
             //! while being pressed
-            static const __int64 KlickImage = 0x0040000;
+            static const __int64 ClickImage = 0x0040000;
             //! Specifies whether the button uses alpha blending
             //! for the background while being pressed
-            static const __int64 KlickAlpha = 0x0080000;
+            static const __int64 ClickAlpha = 0x0080000;
             //! Specifies whether the button has a color gradient
             //! while being pressed
-            static const __int64 KlickBuffer = 0x0100000;
+            static const __int64 ClickBuffer = 0x0100000;
 
-            //! Combines flags Sichtbar, Erlaubt, Border,
-            //! Buffered, MehrfarbigText, KlickBuffer
-            static const __int64 Normal = Sichtbar | Erlaubt | Border | Buffered
-                                        | MehrfarbigText | KlickBuffer;
+            //! Combines flags Visible, Allowed, Border,
+            //! Buffered, MehrfarbigText, ClickBuffer
+            static const __int64 Normal = Visible | Allowed | Border | Buffered
+                                        | MehrfarbigText | ClickBuffer;
         };
 
     private:
-        int klickFarbe;
-        Image* klickImage;
+        int klickColor;
+        Image* clickImage;
         AlphaField* klickBuffer;
         int klickIndex;
         //! Processes mouse messages
@@ -59,15 +59,15 @@ namespace Framework
         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);
+        DLLEXPORT void setClickColor(int fc);
         //! Sets the background image by copying, used when the button is
         //! pressed
         //! \param bild The image to copy
-        DLLEXPORT void setKlickImage(Image* bild);
+        DLLEXPORT void setClickImage(Image* bild);
         //! Sets a pointer to the background image used when the button is
         //! pressed
         //! \param bild The new image
-        DLLEXPORT void setKlickImageZ(Image* bild);
+        DLLEXPORT void setClickImageZ(Image* bild);
         //! Sets a pointer to the color gradient used when the button is pressed
         //! \param af The new color gradient
         DLLEXPORT void setKBZ(AlphaField* af);
@@ -77,7 +77,7 @@ namespace Framework
         DLLEXPORT void setKBStrength(int st);
         //! Sets the color of the color gradient used when the button is pressed
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setKBFarbe(int fc);
+        DLLEXPORT void setKBColor(int fc);
         //! Processes mouse messages
         //! \param me The event triggered by the keyboard input
         DLLEXPORT void doKeyboardEvent(KeyboardEvent& te) override;
@@ -86,12 +86,12 @@ namespace Framework
         DLLEXPORT void render(Image& zRObj) override;
         //! Returns the background color in A8R8G8B8 format used when
         //! the button is pressed
-        DLLEXPORT int getKlickFarbe() const;
+        DLLEXPORT int getClickColor() const;
         //! Returns the background image used when the button is pressed
-        DLLEXPORT Image* getKlickImage() const;
+        DLLEXPORT Image* getClickImage() const;
         //! Returns the background image without increased reference counter
         //! used when the button is pressed
-        DLLEXPORT Image* zKlickImage() const;
+        DLLEXPORT Image* zClickImage() const;
         //! Returns the color gradient used when the button is pressed
         DLLEXPORT AlphaField* getKB() const;
         //! Returns the color gradient without increased reference counter
@@ -99,13 +99,13 @@ namespace Framework
         DLLEXPORT AlphaField* zKB() const;
         //! Returns the color of the color gradient in A8R8G8B8 format
         //! used when the button is pressed
-        DLLEXPORT int getKBFarbe() const;
+        DLLEXPORT int getKBColor() const;
         //! Returns the strength of the color gradient used when the button
         //! is pressed
         DLLEXPORT int getKBStrength() const;
         //! Copies the button so it can be modified without affecting the
         //! original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 
     //! A 2D GUI Framework drawing that renders a selectable checkbox
@@ -122,19 +122,19 @@ namespace Framework
             static const __int64 MehrfarbigText = 0x001000;
             //! Specifies whether the checkbox has a background color
             //! while being pressed
-            static const __int64 KlickFarbe = 0x002000;
+            static const __int64 ClickColor = 0x002000;
             //! Specifies whether the checkbox has a background image
             //! when clicked
-            static const __int64 KlickImage = 0x004000;
+            static const __int64 ClickImage = 0x004000;
             //! Specifies whether alpha blending is used for the
             //! checkbox background when clicked
-            static const __int64 KlickAlpha = 0x008000;
+            static const __int64 ClickAlpha = 0x008000;
             //! Specifies whether the checkbox has a color gradient
             //! when clicked
-            static const __int64 KlickBuffer = 0x010000;
+            static const __int64 ClickBuffer = 0x010000;
             //! Specifies whether the checkbox has a background color
             //! while selected
-            static const __int64 SelectFarbe = 0x020000;
+            static const __int64 SelectColor = 0x020000;
             //! Specifies whether the checkbox has a background image
             //! while selected
             static const __int64 SelectImage = 0x040000;
@@ -151,12 +151,12 @@ namespace Framework
             static const __int64 MehrzeiligText = 0x400000;
             //! Specifies whether the checkbox is currently being clicked
             //! with the mouse. (Managed by the checkbox itself)
-            static const __int64 MausKlick = 0x800000;
+            static const __int64 MouseClick = 0x800000;
 
-            //! Combines the flags Sichtbar, Erlaubt, Border,
-            //! KlickBuffer
+            //! Combines the flags Visible, Allowed, Border,
+            //! ClickBuffer
             static const __int64 Normal
-                = Sichtbar | Erlaubt | Border | KlickBuffer;
+                = Visible | Allowed | Border | ClickBuffer;
         };
 
     private:
@@ -204,20 +204,20 @@ namespace Framework
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets the font to use for the label
-        //! \param schrift The font
-        DLLEXPORT void setFontZ(Font* schrift);
+        //! \param font The font
+        DLLEXPORT void setFontZ(Font* font);
         //! Sets the color of the font used for the label
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setSFarbe(int f);
+        DLLEXPORT void setSColor(int f);
         //! Sets the size of the font used for the label
         //! \param f The height of a line in pixels
         DLLEXPORT void setSSize(int gr);
         //! Sets the background color used while the checkbox is selected
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setSBgFarbe(int f);
+        DLLEXPORT void setSBgColor(int f);
         //! Sets the background color used while the checkbox is being clicked
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setKBgFarbe(int f);
+        DLLEXPORT void setKBgColor(int f);
         //! Sets a pointer to the background image used while the checkbox
         //! is selected \param b The image
         DLLEXPORT void setSBgImageZ(Image* b);
@@ -235,7 +235,7 @@ namespace Framework
         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);
+        DLLEXPORT void setSAFColor(int f);
         //! Sets the strength of the color gradient used while the checkbox
         //! is selected \param st The strength
         DLLEXPORT void setSAFStrength(int st);
@@ -244,7 +244,7 @@ namespace Framework
         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);
+        DLLEXPORT void setKAFColor(int f);
         //! Sets the strength of the color gradient used while the checkbox
         //! is being clicked \param st The strength
         DLLEXPORT void setKAFStrength(int st);
@@ -275,15 +275,15 @@ namespace Framework
         //! Returns the font used without increased reference counter
         DLLEXPORT Font* zFont() const;
         //! Returns the font color in A8R8G8B8 format
-        DLLEXPORT int getSFarbe() const;
+        DLLEXPORT int getSColor() const;
         //! Returns the font size
         DLLEXPORT int getSSize() const;
         //! Returns the background color in A8R8G8B8 format used while
         //! the checkbox is selected
-        DLLEXPORT int getSBgFarbe() const;
+        DLLEXPORT int getSBgColor() const;
         //! Returns the background color in A8R8G8B8 format used while
         //! the checkbox is being clicked
-        DLLEXPORT int getKBgFarbe() const;
+        DLLEXPORT int getKBgColor() const;
         //! Returns the background image used while the checkbox is selected
         DLLEXPORT Image* getSBgImage() const;
         //! Returns the background image without increased reference counter

Cache.h

@@ -207,7 +207,7 @@ namespace Framework
 
         void reset() const
         {
-            cache->leeren();
+            cache->clear();
         }
 
         CacheIterator<K, T> begin()

Camera2D.cpp

@@ -9,7 +9,7 @@ using namespace Framework;
 Camera2D::Camera2D()
     : DrawableBackground()
 {
-    setStyle(Style::Sichtbar);
+    setStyle(Style::Visible);
     welt = 0;
     rotation = 0;
     matrix = Mat3<float>::identity();
@@ -58,7 +58,7 @@ void Camera2D::lookAtWorldPos(Vertex pos)
 
 void Camera2D::lookAtWorldArea(float width, float height)
 {
-    zoom = (float)getBreite() / width;
+    zoom = (float)getWidth() / width;
     // TODO have two scaling factors
 }
 
@@ -90,7 +90,7 @@ bool Camera2D::tick(double time)
 
 void Camera2D::render(Image& zRObj)
 {
-    if (hatStyleNicht(Style::Sichtbar)) return;
+    if (hasStyleNot(Style::Visible)) return;
     DrawableBackground::render(zRObj);
     if (!welt) return;
     lockDrawable();
@@ -107,7 +107,7 @@ void Camera2D::render(Image& zRObj)
     unlockDrawable();
 }
 
-Vertex Camera2D::getWorldCoordinates(Punkt screenPos)
+Vertex Camera2D::getWorldCoordinates(Point screenPos)
 {
     Vertex wKoord
         = (Mat3<float>::translation(wPos) * Mat3<float>::scaling(1 / zoom)
@@ -168,32 +168,32 @@ bool TestCamera2D::tick(double time)
 {
     bool ret = rend;
     rend = Camera2D::tick(time);
-    if (getTastenStand('q'))
+    if (getKeyState('q'))
     {
         rotation += (float)(time * 0.5);
         ret = 1;
     }
-    if (getTastenStand('e'))
+    if (getKeyState('e'))
     {
         rotation -= (float)(time * 0.5);
         ret = 1;
     }
     Vertex move;
-    if (getTastenStand('w')) move = Vertex(0, -100 * (float)time);
-    if (getTastenStand('a')) move = Vertex(-100 * (float)time, 0);
-    if (getTastenStand('d')) move = Vertex(100 * (float)time, 0);
-    if (getTastenStand('s')) move = Vertex(0, +100 * (float)time);
+    if (getKeyState('w')) move = Vertex(0, -100 * (float)time);
+    if (getKeyState('a')) move = Vertex(-100 * (float)time, 0);
+    if (getKeyState('d')) move = Vertex(100 * (float)time, 0);
+    if (getKeyState('s')) move = Vertex(0, +100 * (float)time);
     if (move != Vertex(0, 0))
     {
         wPos += move.rotation(-rotation) * (1 / zoom);
         ret = 1;
     }
-    if (getTastenStand('+'))
+    if (getKeyState('+'))
     {
         zoom += (zoom) * (float)time;
         ret = 1;
     }
-    if (getTastenStand('-'))
+    if (getKeyState('-'))
     {
         zoom -= (zoom) * (float)time;
         if (zoom <= 0) zoom = 1;

Camera2D.h

@@ -33,7 +33,7 @@ namespace Framework
         __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);
+        __declspec(dllexport) Vertex getWorldCoordinates(Point screenPos);
         __declspec(dllexport) Vertex getWorldDirection(Vertex dir);
         __declspec(dllexport) Vertex getWorldPosition();
         __declspec(dllexport) float getRotation();

Camera3D.cpp

@@ -125,7 +125,7 @@ void Cam3D::setRotation(Vec3<float> rotation)
 
 // Sets the position of the image on the screen
 //  p: A point with x and y coordinates in pixels
-void Cam3D::setScreenPosition(Punkt p)
+void Cam3D::setScreenPosition(Point p)
 {
     viewport.x = (float)p.x;
     viewport.y = (float)p.y;
@@ -142,7 +142,7 @@ void Cam3D::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 Cam3D::setScreenSize(Punkt p)
+void Cam3D::setScreenSize(Point p)
 {
     viewport.width = (float)p.x;
     viewport.height = (float)p.y;
@@ -215,30 +215,30 @@ bool Cam3D::tick(double tv)
 {
     bool ret = rend;
     rend = 0;
-    if (hatStyle(Style::Rotatable))
+    if (hasStyle(Style::Rotatable))
     {
-        if (getTastenStand(T_Oben))
+        if (getKeyState(T_Oben))
         {
             rotX -= (float)tv;
             ret = 1;
         }
-        if (getTastenStand(T_Unten))
+        if (getKeyState(T_Unten))
         {
             rotX += (float)tv;
             ret = 1;
         }
-        if (getTastenStand(T_Links))
+        if (getKeyState(T_Links))
         {
             rotY -= (float)tv;
             ret = 1;
         }
-        if (getTastenStand(T_Rechts))
+        if (getKeyState(T_Rechts))
         {
             rotY += (float)tv;
             ret = 1;
         }
     }
-    if (hatStyle(Style::Movable))
+    if (hasStyle(Style::Movable))
     {
         Vec3<float> n(0, 0, 1);
         Vec3<float> n2(1, 0, 0);
@@ -250,39 +250,39 @@ bool Cam3D::tick(double tv)
         n2 = n2 * (float)tv * speed;
         n3 = tmp * n3;
         n3 = n3 * (float)tv * speed;
-        if (getTastenStand('W'))
+        if (getKeyState('W'))
         {
             pos += n;
             ret = 1;
         }
-        if (getTastenStand('S'))
+        if (getKeyState('S'))
         {
             pos -= n;
             ret = 1;
         }
-        if (getTastenStand('D'))
+        if (getKeyState('D'))
         {
             pos += n2;
             ret = 1;
         }
-        if (getTastenStand('A'))
+        if (getKeyState('A'))
         {
             pos -= n2;
             ret = 1;
         }
-        if (getTastenStand(' '))
+        if (getKeyState(' '))
         {
             pos += n3;
             ret = 1;
         }
-        if (getTastenStand(T_Shift))
+        if (getKeyState(T_Shift))
         {
             pos -= n3;
             ret = 1;
         }
     }
     updateMatrix();
-    if (welt && hatStyle(Style::Tick)) return welt->tick(tv) || ret;
+    if (welt && hasStyle(Style::Tick)) return welt->tick(tv) || ret;
     return ret;
 }
 
@@ -290,26 +290,26 @@ bool Cam3D::tick(double tv)
 //  me: The mouse event to be processed
 void Cam3D::doMouseEvent(MouseEvent& me)
 {
-    if (me.verarbeitet) return;
+    if (me.processed) return;
     if (me.mx > viewport.x && me.my > viewport.y
         && me.mx < viewport.x + viewport.width
         && me.my < viewport.y + viewport.height)
     {
         MouseEvent3D me3d;
         me3d.id = me.id;
-        me3d.verarbeitet = me.verarbeitet;
-        Vec3<float> mausP
+        me3d.processed = me.processed;
+        Vec3<float> mouseP
             = Vec3<float>((me.mx - viewport.x) / (0.5f * viewport.width) - 1,
                 (me.my - viewport.y) / (0.5f * viewport.height) - 1,
                 0);
-        Vec3<float> mausT = Vec3<float>(mausP.x, mausP.y, 1);
+        Vec3<float> mouseT = Vec3<float>(mouseP.x, mouseP.y, 1);
         Mat4<float> mat = proj * view;
         mat = mat.getInverse();
-        mausP = mat * mausP;
-        mausT = mat * mausT;
-        me3d.pos = mausP;
-        me3d.dir = mausT - mausP;
-        me.verarbeitet = 1;
+        mouseP = mat * mouseP;
+        mouseT = mat * mouseT;
+        me3d.pos = mouseP;
+        me3d.dir = mouseT - mouseP;
+        me.processed = 1;
     }
 }
 
@@ -320,7 +320,7 @@ 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 Cam3D::hatStyle(__int64 style) const
+bool Cam3D::hasStyle(__int64 style) const
 {
     return (this->style | style) == this->style;
 }
@@ -328,7 +328,7 @@ bool Cam3D::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 Cam3D::hatStyleNicht(__int64 style) const
+bool Cam3D::hasStyleNot(__int64 style) const
 {
     return (this->style | style) != this->style;
 }
@@ -347,7 +347,7 @@ const Vec3<float>& Cam3D::getWorldPosition() const
 
 // Returns the position in the world
 //  screen: the screen position to be translated
-const Vec3<float> Cam3D::getWorldPosition(Punkt screen) const
+const Vec3<float> Cam3D::getWorldPosition(Point screen) const
 {
     Vec3<float> point = Vec3<float>(
         (screen.x - viewport.x) / (0.5f * viewport.width) - 1,
@@ -363,7 +363,7 @@ const Vec3<float> Cam3D::getWorldPosition(Punkt screen) const
 
 // Returns the direction of the camera in the world
 //  screen: the screen position to be translated
-const Vec3<float> Cam3D::getWorldDirection(Punkt screen) const
+const Vec3<float> Cam3D::getWorldDirection(Point screen) const
 {
     Vec3<float> point = Vec3<float>(
         (screen.x - viewport.x) / (0.5f * viewport.width) - 1,
@@ -401,15 +401,15 @@ const Vec3<float> Cam3D::getRotation() const
 }
 
 //! Returns the position of the camera on the screen
-const Punkt Cam3D::getScreenPos() const
+const Point Cam3D::getScreenPos() const
 {
-    return Punkt((int)viewport.x, (int)viewport.y);
+    return Point((int)viewport.x, (int)viewport.y);
 }
 
 //! Returns the size of the camera on the screen
-const Punkt Cam3D::getScreenSize() const
+const Point Cam3D::getScreenSize() const
 {
-    return Punkt((int)viewport.width, (int)viewport.height);
+    return Point((int)viewport.width, (int)viewport.height);
 }
 
 // Returns the world

Camera3D.h

@@ -82,14 +82,14 @@ namespace Framework
         DLLEXPORT void setRotation(Vec3<float> rotation);
         //! Sets the position of the image on the screen
         //! \param p A point with x and y coordinates in pixels
-        DLLEXPORT void setScreenPosition(Punkt p);
+        DLLEXPORT void setScreenPosition(Point p);
         //! Sets the position of the image on the screen
         //! \param x The x coordinate in pixels
         //! \param y The y coordinate in pixels
         DLLEXPORT void setScreenPosition(int x, int y);
         //! Sets the size of the image on the screen
         //! \param p A point with x as width and y as height in pixels
-        DLLEXPORT void setScreenSize(Punkt p);
+        DLLEXPORT void setScreenSize(Point p);
         //! Sets the size of the image on the screen
         //! \param br The width in pixels
         //! \param hi The height in pixels
@@ -127,21 +127,21 @@ namespace Framework
         //! Returns whether specific styles are set
         //! \param style The styles to check
         //! \return 1 if all styles in style are set
-        DLLEXPORT bool hatStyle(__int64 style) const;
+        DLLEXPORT bool hasStyle(__int64 style) const;
         //! Returns whether specific styles are not set
         //! \param style The styles to check
         //! \return 1 if all styles in style are not set
-        DLLEXPORT bool hatStyleNicht(__int64 style) const;
+        DLLEXPORT bool hasStyleNot(__int64 style) const;
         //! Returns a pointer to the viewport
         DLLEXPORT const ViewPort* zViewPort() const;
         //! Returns the position of the camera in the world
         DLLEXPORT const Vec3<float>& getWorldPosition() const;
         //! Returns the position in the world
         //! \param screen The position on the screen to translate
-        DLLEXPORT const Vec3<float> getWorldPosition(Punkt screen) const;
+        DLLEXPORT const Vec3<float> getWorldPosition(Point screen) const;
         //! Returns the direction of the camera in the world
         //! \param screen The position on the screen to translate
-        DLLEXPORT const Vec3<float> getWorldDirection(Punkt screen) const;
+        DLLEXPORT const Vec3<float> getWorldDirection(Point screen) const;
         //! Returns the projection matrix of the camera
         DLLEXPORT const Mat4<float>& getProjectionMatrix() const;
         //! Returns the view matrix of the camera
@@ -149,9 +149,9 @@ namespace Framework
         //! Returns the rotation around individual axes
         DLLEXPORT const Vec3<float> getRotation() const;
         //! Returns the position of the camera on the screen
-        DLLEXPORT const Punkt getScreenPos() const;
+        DLLEXPORT const Point getScreenPos() const;
         //! Returns the size of the camera on the screen
-        DLLEXPORT const Punkt getScreenSize() const;
+        DLLEXPORT const Point getScreenSize() const;
         //! Returns the world
         DLLEXPORT World3D* getWorld() const;
         //! Returns the world without increased reference counter

Console.cpp

@@ -682,8 +682,8 @@ void Framework::InputLine::applyAutocompletion()
     RCArray<Text> suggestions;
     for (ConsoleCommand* command : commands)
     {
-        if ((!paramsStarted && command->getName().hatAt(0, *name))
-            || (paramsStarted && command->getName().istGleich(*name)))
+        if ((!paramsStarted && command->getName().hasAt(0, *name))
+            || (paramsStarted && command->getName().isEqual(*name)))
         {
             if (paramsStarted)
             {
@@ -785,7 +785,7 @@ bool Framework::InputLine::executeCommand(Text command)
     RCArray<Text> suggestions;
     for (ConsoleCommand* command : commands)
     {
-        if (command->getName().istGleich(*name))
+        if (command->getName().isEqual(*name))
         {
             name->release();
             return command->execute(params);
@@ -926,7 +926,7 @@ void Framework::ConsoleListView::setMaxColumns(int maxColumns)
 
 void Framework::ConsoleListView::addItem(Text item)
 {
-    item.ersetzen("\n", " ");
+    item.replace("\n", " ");
     int index = 0;
     for (Text* curreent : items)
     {
@@ -961,7 +961,7 @@ void Framework::ConsoleListView::addItem(Text item)
 
 void Framework::ConsoleListView::clear()
 {
-    items.leeren();
+    items.clear();
 }
 
 const RCArray<Text>& Framework::ConsoleListView::getItems() const

DLLRegister.cpp

@@ -32,14 +32,14 @@ DLLRegister::~DLLRegister()
 }
 
 // non-constant
-HINSTANCE DLLRegister::ladeDLL(const char* name, const char* pfad)
+HINSTANCE DLLRegister::loadDLL(const char* name, const char* pfad)
 {
     cs.lock();
     int anz = dlls->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
         DLLFile* tmp = dlls->get(i);
-        if (tmp && tmp->name->istGleich(name))
+        if (tmp && tmp->name->isEqual(name))
         {
             tmp->ref++;
             cs.unlock();
@@ -68,7 +68,7 @@ void DLLRegister::releaseDLL(const char* name)
     for (int i = 0; i < anz; i++)
     {
         DLLFile* tmp = dlls->get(i);
-        if (tmp && tmp->name->istGleich(name))
+        if (tmp && tmp->name->isEqual(name))
         {
             tmp->ref--;
             if (!tmp->ref)

DLLRegister.h

@@ -25,7 +25,7 @@ namespace Framework
         //! Destructor
         DLLEXPORT ~DLLRegister();
         //! non-constant
-        DLLEXPORT HINSTANCE ladeDLL(const char* name, const char* pfad);
+        DLLEXPORT HINSTANCE loadDLL(const char* name, const char* pfad);
         DLLEXPORT void releaseDLL(const char* name);
     };
 } // namespace Framework

DX11GraphicsApi.cpp

@@ -155,7 +155,7 @@ void DirectX11::initialize(
     //--------------------------------------------------------------------
     // Create Device
 
-    HINSTANCE dxgiDLL = getDLLRegister()->ladeDLL("dxgi.dll", "dxgi.dll");
+    HINSTANCE dxgiDLL = getDLLRegister()->loadDLL("dxgi.dll", "dxgi.dll");
     if (!dxgiDLL)
     {
         WMessageBox(fenster->getWindowHandle(),
@@ -211,7 +211,7 @@ void DirectX11::initialize(
         usedAdapter = adapter;
     }
 
-    HINSTANCE dll = getDLLRegister()->ladeDLL("d3d11.dll", "d3d11.dll");
+    HINSTANCE dll = getDLLRegister()->loadDLL("d3d11.dll", "d3d11.dll");
     if (!dll)
     {
         WMessageBox(fenster->getWindowHandle(),
@@ -486,7 +486,7 @@ void DirectX11::initialize(
     // Framework Backbuffer Texture
     Image* renderB = new Image(1);
     renderB->setAlpha3D(1);
-    renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
+    renderB->newImage(this->backBufferSize.x, this->backBufferSize.y, 0);
 
     uiTexture = createOrGetTexture("_f_Render_Image", renderB);
     ((DX11Texture*)uiTexture)->setUseMips(0);
@@ -514,9 +514,9 @@ void DirectX11::initialize(
 
     // Setup Render Objekt
 
-    vertexShader->benutzeShader();
+    vertexShader->useShader();
     d3d11Context->PSSetSamplers(0, 1, &sampleState);
-    pixelShader->benutzeShader();
+    pixelShader->useShader();
 
     D3D11_RASTERIZER_DESC rasterDesc;
     ZeroMemory(&rasterDesc, sizeof(rasterDesc));
@@ -546,7 +546,7 @@ void DirectX11::initialize(
     d3d11Context->RSSetState(texturRS);
 
     Image* b = new Image();
-    b->neuImage(10, 10, 0xFFFFFFFF);
+    b->newImage(10, 10, 0xFFFFFFFF);
     defaultTexture = createOrGetTexture("_default_textur", b);
 
     diffuseLights = new DX11StructuredBuffer(
@@ -577,7 +577,7 @@ void DirectX11::update()
         meshRS->Release();
         meshRS = NULL;
     }
-    texturRegister->leeren();
+    texturRegister->clear();
     if (defaultTexture) defaultTexture = (Texture*)defaultTexture->release();
     if (blendStateAlphaBlend)
     {
@@ -653,7 +653,7 @@ void DirectX11::update()
 
 void DirectX11::beginFrame(bool fill2D, bool fill3D, int fillColor)
 {
-    if (fill2D) uiTexture->zImage()->setFarbe(fillColor);
+    if (fill2D) uiTexture->zImage()->setColor(fillColor);
     if (fill3D || true)
     {
         float color[4];
@@ -680,16 +680,16 @@ void DirectX11::renderObject(Model3D* zObj)
     int curId = zObj->zModelData()->getId();
     zObj->zModelData()->updateGPUMemory();
     Mat4<float> trans = Mat4<float>::identity();
-    int anz = zObj->errechneMatrizen(trans, matrixBuffer);
+    int anz = zObj->calculateMatrices(trans, matrixBuffer);
     if (vertexShader)
-        vertexShader->fuellConstBuffer(
+        vertexShader->fillConstBuffer(
             (char*)matrixBuffer, 0, sizeof(Mat4<float>) * anz);
     float matirialBuffer[3]; // light factors (phong model)
     matirialBuffer[0] = zObj->getAmbientFactor();
     matirialBuffer[1] = zObj->getDiffusFactor();
     matirialBuffer[2] = zObj->getSpecularFactor();
     if (pixelShader)
-        pixelShader->fuellConstBuffer(
+        pixelShader->fillConstBuffer(
             (char*)matirialBuffer, 1, sizeof(float) * 3);
     unsigned int offset = 0;
     unsigned int es
@@ -704,19 +704,19 @@ void DirectX11::renderObject(Model3D* zObj)
     {
         ID3D11ShaderResourceView* v[1];
         DX11Texture* zEffectTexture = (DX11Texture*)zObj->zEffectTexture();
-        if (zEffectTexture && zEffectTexture->brauchtUpdate())
+        if (zEffectTexture && zEffectTexture->needsUpdate())
             zEffectTexture->updateTextur();
         v[0] = *zEffectTexture;
         d3d11Context->PSSetShaderResources(3, 1, v);
         TextureEffect e = {1, zObj->getEffectPercentage()};
         if (pixelShader)
-            pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TextureEffect));
+            pixelShader->fillConstBuffer((char*)&e, 3, sizeof(TextureEffect));
     }
     else
     {
         TextureEffect e = {0, 0.f};
         if (pixelShader)
-            pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TextureEffect));
+            pixelShader->fillConstBuffer((char*)&e, 3, sizeof(TextureEffect));
     }
     DXGI_FORMAT f = DXGI_FORMAT_R32_UINT;
     if (zObj->zModelData()->zDXIndexBuffer()->getElementLength() == 2)
@@ -732,7 +732,7 @@ void DirectX11::renderObject(Model3D* zObj)
         if (zObj->needRenderPolygon(ind))
         {
             Texture* t = zTexture->zPolygonTexture(ind);
-            if (t && t->brauchtUpdate()) t->updateTextur();
+            if (t && t->needsUpdate()) t->updateTextur();
             if (t)
             {
                 ID3D11ShaderResourceView* v[3];
@@ -833,14 +833,14 @@ void DirectX11::renderKamera(Cam3D* zKamera)
     viewAndProj[1] = zKamera->getProjectionMatrix();
     kamPos = zKamera->getWorldPosition();
     if (vertexShader)
-        vertexShader->fuellConstBuffer(
+        vertexShader->fillConstBuffer(
             (char*)viewAndProj, 1, sizeof(Mat4<float>) * 2);
     if (pixelShader)
-        pixelShader->fuellConstBuffer((char*)&kamPos, 0, sizeof(float) * 3);
+        pixelShader->fillConstBuffer((char*)&kamPos, 0, sizeof(float) * 3);
     World3D* w = zKamera->zWorld();
     w->lock();
     int lc[] = {w->getDiffuseLightCount(), w->getPointLightCount()};
-    pixelShader->fuellConstBuffer((char*)lc, 2, sizeof(int) * 2);
+    pixelShader->fillConstBuffer((char*)lc, 2, sizeof(int) * 2);
     w->copyLight(diffuseLights, pointLights);
     int maxDist = 0;
     int minDist = 0x7FFFFFFF;
@@ -851,11 +851,11 @@ void DirectX11::renderKamera(Cam3D* zKamera)
         {
             if ((int)dist > maxDist) maxDist = (int)dist;
             if ((int)dist < minDist) minDist = (int)dist;
-            if (obj->hatAlpha())
+            if (obj->hasAlpha())
                 alphaModels.add(obj);
             else
             {
-                pixelShader->fuellConstBuffer((char*)lc, 2, sizeof(int) * 2);
+                pixelShader->fillConstBuffer((char*)lc, 2, sizeof(int) * 2);
                 renderObject(obj);
             }
         }
@@ -899,12 +899,12 @@ void DirectX11::renderKamera(Cam3D* zKamera, Texture* zTarget)
         throw "incompatible textur object was passed to renderKamera of "
               "DirectX11 GPU API";
     d11Textur->setRenderTarget(1);
-    if (d11Textur->brauchtUpdate()) d11Textur->updateTextur();
+    if (d11Textur->needsUpdate()) d11Textur->updateTextur();
 
     D3D11_TEXTURE2D_DESC depthBufferDesc;
     ZeroMemory(&depthBufferDesc, sizeof(depthBufferDesc));
     // Set up the description of the depth buffer.
-    depthBufferDesc.Width = zTarget->zImage()->getBreite();
+    depthBufferDesc.Width = zTarget->zImage()->getWidth();
     depthBufferDesc.Height = zTarget->zImage()->getHeight();
     depthBufferDesc.MipLevels = 1;
     depthBufferDesc.ArraySize = 1;
@@ -971,10 +971,10 @@ void DirectX11::presentFrame()
         = view.projektion((float)PI / 4.0f, screenAspect, 0.1f, 10000.f);
     kamPos = Vec3<float>(0.f, 0.f, backBufferSize.y * 1.2075f);
     if (vertexShader)
-        vertexShader->fuellConstBuffer(
+        vertexShader->fillConstBuffer(
             (char*)viewAndProj, 1, sizeof(Mat4<float>) * 2);
     if (pixelShader)
-        pixelShader->fuellConstBuffer((char*)&kamPos, 0, sizeof(float) * 3);
+        pixelShader->fillConstBuffer((char*)&kamPos, 0, sizeof(float) * 3);
 
     if (fenster && !IsIconic(fenster->getWindowHandle()))
         renderObject(texturModel);
@@ -1029,9 +1029,9 @@ typedef HRESULT(__stdcall* D3D11CreateDeviceFunction)(IDXGIAdapter*,
 
 bool DirectX11::isAvailable()
 {
-    HINSTANCE dxgiDLL = getDLLRegister()->ladeDLL("dxgi.dll", "dxgi.dll");
+    HINSTANCE dxgiDLL = getDLLRegister()->loadDLL("dxgi.dll", "dxgi.dll");
     if (!dxgiDLL) return 0;
-    HINSTANCE d3d11DLL = getDLLRegister()->ladeDLL("d3d11.dll", "d3d11.dll");
+    HINSTANCE d3d11DLL = getDLLRegister()->loadDLL("d3d11.dll", "d3d11.dll");
     if (!d3d11DLL)
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
@@ -1175,12 +1175,12 @@ DX11VertexShader* DirectX11::initializeVertexShader(
     polygonLayout[4].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA;
     polygonLayout[4].InstanceDataStepRate = 0;
 
-    vertexShader->erstelleInputLayout(polygonLayout, 5);
-    vertexShader->erstelleConstBuffer(sizeof(Mat4<float>) * MAX_KNOCHEN_ANZ,
+    vertexShader->createInputLayout(polygonLayout, 5);
+    vertexShader->createConstBuffer(sizeof(Mat4<float>) * MAX_KNOCHEN_ANZ,
         vertexShader
             ->getFirstUninitializedBufferIndex()); // matrices for skeleton
                                                     // animations
-    vertexShader->erstelleConstBuffer(sizeof(Mat4<float>) * 2,
+    vertexShader->createConstBuffer(sizeof(Mat4<float>) * 2,
         vertexShader
             ->getFirstUninitializedBufferIndex()); // View and Projection Matrix
     return vertexShader;
@@ -1193,20 +1193,20 @@ DX11PixelShader* DirectX11::initializePixelShader(
         = new DX11PixelShader(d3d11Device, d3d11Context);
     pixelShader->setCompiledByteArray((unsigned char*)byteCode, size);
 
-    pixelShader->erstelleConstBuffer(sizeof(float) * 3,
+    pixelShader->createConstBuffer(sizeof(float) * 3,
         pixelShader->getFirstUninitializedBufferIndex()); // Camera position
-    pixelShader->erstelleConstBuffer(sizeof(float) * 3,
+    pixelShader->createConstBuffer(sizeof(float) * 3,
         pixelShader->getFirstUninitializedBufferIndex()); // material constants
                                                           // using phong model
-    pixelShader->erstelleConstBuffer(
+    pixelShader->createConstBuffer(
         sizeof(int) * 2, pixelShader->getFirstUninitializedBufferIndex());
-    pixelShader->erstelleConstBuffer(
+    pixelShader->createConstBuffer(
         sizeof(TextureEffect), pixelShader->getFirstUninitializedBufferIndex());
     // TODO: Remove Following Test Code
     int lc[] = {0, 0};
-    pixelShader->fuellConstBuffer((char*)lc, 2, sizeof(int) * 2);
+    pixelShader->fillConstBuffer((char*)lc, 2, sizeof(int) * 2);
     TextureEffect e = {0, 0.f};
-    pixelShader->fuellConstBuffer((char*)&e, 3, sizeof(TextureEffect));
+    pixelShader->fillConstBuffer((char*)&e, 3, sizeof(TextureEffect));
     return pixelShader;
 }
 

DX12Buffer.cpp

@@ -37,7 +37,7 @@ DX12Buffer::~DX12Buffer()
 }
 
 // Copies the data into the buffer if it has changed
-void DX12Buffer::copieren(int byteCount)
+void DX12Buffer::copyData(int byteCount)
 {
     if (!len) return;
     if (byteCount < 0) byteCount = len;
@@ -109,7 +109,7 @@ DX12IndexBuffer::DX12IndexBuffer(int eSize,
 DX12IndexBuffer::~DX12IndexBuffer() {}
 
 // Copies the data into the buffer if it has changed
-void DX12IndexBuffer::copieren(int byteCount)
+void DX12IndexBuffer::copyData(int byteCount)
 {
     /*if( ibs )
     {
@@ -124,7 +124,7 @@ void DX12IndexBuffer::copieren(int byteCount)
         direct->execute();
         ibs = 0;
     }*/
-    DX12Buffer::copieren(byteCount);
+    DX12Buffer::copyData(byteCount);
     // copy->execute();
     /*D3D12_RESOURCE_BARRIER barrier;
     barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
@@ -153,7 +153,7 @@ DX12VertexBuffer::DX12VertexBuffer(int eSize,
 DX12VertexBuffer::~DX12VertexBuffer() {}
 
 // Copies the data into the buffer if it has changed
-void DX12VertexBuffer::copieren(int byteCount)
+void DX12VertexBuffer::copyData(int byteCount)
 {
     /*if( vbs )
     {
@@ -169,7 +169,7 @@ void DX12VertexBuffer::copieren(int byteCount)
         direct->execute();
         vbs = 0;
     }*/
-    DX12Buffer::copieren(byteCount);
+    DX12Buffer::copyData(byteCount);
     // copy->execute();
     /*D3D12_RESOURCE_BARRIER barrier;
     barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;

DX12Buffer.h

@@ -28,7 +28,7 @@ namespace Framework
         //! Destructor
         DLLEXPORT virtual ~DX12Buffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT void copieren(int byteCount = -1) override;
+        DLLEXPORT virtual void copyData(int byteCount = -1) override;
         //! Returns the buffer
         DLLEXPORT ID3D12Resource* zBuffer() const;
     };
@@ -47,7 +47,7 @@ namespace Framework
             DX12DirectCommandQueue* direct);
         ~DX12IndexBuffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT void copieren(int byteCount = -1) override;
+        DLLEXPORT void copyData(int byteCount = -1) override;
     };
 
     class DX12VertexBuffer : public DX12Buffer
@@ -64,6 +64,6 @@ namespace Framework
             DX12DirectCommandQueue* direct);
         ~DX12VertexBuffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT void copieren(int byteCount = -1) override;
+        DLLEXPORT void copyData(int byteCount = -1) override;
     };
 } // namespace Framework

DX12CommandQueue.h

@@ -3,7 +3,7 @@
 #include "OperatingSystem.h"
 #include "ReferenceCounter.h"
 
-//! DirectX12 Datentypen
+//! DirectX12 Datatypen
 struct ID3D12CommandAllocator;
 struct ID3D12CommandQueue;
 struct ID3D12Fence;

DX12GraphicsApi.cpp

@@ -120,7 +120,7 @@ void DirectX12::initialize(
         return GraphicsApi::initialize(fenster, backBufferSize, fullScreen);
     GraphicsApi::initialize(fenster, backBufferSize, fullScreen);
 
-    HINSTANCE dxgiDLL = getDLLRegister()->ladeDLL("dxgi.dll", "dxgi.dll");
+    HINSTANCE dxgiDLL = getDLLRegister()->loadDLL("dxgi.dll", "dxgi.dll");
     if (!dxgiDLL)
     {
         WMessageBox(fenster->getWindowHandle(),
@@ -129,7 +129,7 @@ void DirectX12::initialize(
             MB_ICONERROR);
         return;
     }
-    HINSTANCE d3d12DLL = getDLLRegister()->ladeDLL("d3d12.dll", "d3d12.dll");
+    HINSTANCE d3d12DLL = getDLLRegister()->loadDLL("d3d12.dll", "d3d12.dll");
     if (!d3d12DLL)
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
@@ -456,7 +456,7 @@ void DirectX12::initialize(
 
     Image* renderB = new Image(1);
     renderB->setAlpha3D(1);
-    renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
+    renderB->newImage(this->backBufferSize.x, this->backBufferSize.y, 0);
     uiTexture = createOrGetTexture("_f_Render_Image", renderB);
 
     texturModel->setSize(Vec2<float>(2.f, 2.f));
@@ -550,16 +550,16 @@ void DirectX12::initialize(
         = new DX12VertexShader(device, copyCommandQueue, directCommandQueue);
     vertexShader->setCompiledByteArray(
         (unsigned char*)DX12VertexShaderBytes, sizeof(DX12VertexShaderBytes));
-    vertexShader->erstelleConstBuffer(sizeof(Mat4<float>) * 2, 0);
-    vertexShader->erstelleConstBuffer(sizeof(Mat4<float>) * 128, 1);
+    vertexShader->createConstBuffer(sizeof(Mat4<float>) * 2, 0);
+    vertexShader->createConstBuffer(sizeof(Mat4<float>) * 128, 1);
 
     pixelShader
         = new DX12PixelShader(device, copyCommandQueue, directCommandQueue);
     pixelShader->setCompiledByteArray(
         (unsigned char*)DX12PixelShaderBytes, sizeof(DX12PixelShaderBytes));
-    pixelShader->erstelleConstBuffer(sizeof(float) * 4, 2);
-    pixelShader->erstelleConstBuffer(sizeof(float) * 3, 3);
-    pixelShader->erstelleConstBuffer(sizeof(int) * 2, 4);
+    pixelShader->createConstBuffer(sizeof(float) * 4, 2);
+    pixelShader->createConstBuffer(sizeof(float) * 3, 3);
+    pixelShader->createConstBuffer(sizeof(int) * 2, 4);
 
     D3D12_INPUT_ELEMENT_DESC inputLayout[] = {
         {"POSITION",
@@ -584,7 +584,7 @@ void DirectX12::initialize(
          D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}
     };
 
-    vertexShader->erstelleInputLayout(inputLayout, 5);
+    vertexShader->createInputLayout(inputLayout, 5);
 
     D3D12_FEATURE_DATA_ROOT_SIGNATURE featureData = {};
     featureData.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1;
@@ -777,7 +777,7 @@ void DirectX12::update()
     copyCommandQueue->flush();
     computeCommandQueue->flush();
     modelList->removeAll();
-    HINSTANCE dxgiDLL = getDLLRegister()->ladeDLL("dxgi.dll", "dxgi.dll");
+    HINSTANCE dxgiDLL = getDLLRegister()->loadDLL("dxgi.dll", "dxgi.dll");
     if (!dxgiDLL)
     {
         WMessageBox(fenster->getWindowHandle(),
@@ -927,7 +927,7 @@ void DirectX12::update()
 
     Image* renderB = new Image(1);
     renderB->setAlpha3D(1);
-    renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
+    renderB->newImage(this->backBufferSize.x, this->backBufferSize.y, 0);
     uiTexture = createOrGetTexture("_f_Render_Image", renderB);
 
     texturModel->setTexture(dynamic_cast<Texture*>(uiTexture->getThis()));
@@ -948,7 +948,7 @@ void DirectX12::beginFrame(bool fill2D, bool fill3D, int fillColor)
 
     directCommandQueue->getCommandList()->ResourceBarrier(1, &barrier);
 
-    if (fill2D) uiTexture->zImage()->setFarbe(fillColor);
+    if (fill2D) uiTexture->zImage()->setColor(fillColor);
     if (fill3D)
     {
         float color[4];
@@ -969,24 +969,24 @@ void DirectX12::beginFrame(bool fill2D, bool fill3D, int fillColor)
             rtv, color, 0, 0);
     }
     int lc[] = {0, 0};
-    pixelShader->fuellConstBuffer((char*)lc, 4, sizeof(int) * 2);
+    pixelShader->fillConstBuffer((char*)lc, 4, sizeof(int) * 2);
 }
 
 void DirectX12::renderObject(Model3D* zObj)
 {
     Mat4<float> trans = Mat4<float>::identity();
-    zObj->zModelData()->zDXVertexBuffer()->copieren();
-    zObj->zModelData()->zDXIndexBuffer()->copieren();
-    int anz = zObj->errechneMatrizen(trans, matrixBuffer);
+    zObj->zModelData()->zDXVertexBuffer()->copyData();
+    zObj->zModelData()->zDXIndexBuffer()->copyData();
+    int anz = zObj->calculateMatrices(trans, matrixBuffer);
     if (vertexShader)
-        vertexShader->fuellConstBuffer(
+        vertexShader->fillConstBuffer(
             (char*)matrixBuffer, 1, sizeof(Mat4<float>) * anz);
     float matirialBuffer[3]; // light factors (phong model)
     matirialBuffer[0] = zObj->getAmbientFactor();
     matirialBuffer[1] = zObj->getDiffusFactor();
     matirialBuffer[2] = zObj->getSpecularFactor();
     if (pixelShader)
-        pixelShader->fuellConstBuffer(
+        pixelShader->fillConstBuffer(
             (char*)matirialBuffer, 3, sizeof(float) * 3);
     unsigned int offset = 0;
     unsigned int es
@@ -999,7 +999,7 @@ void DirectX12::renderObject(Model3D* zObj)
         if (zObj->needRenderPolygon(ind))
         {
             Texture* t = zTexture->zPolygonTexture(ind);
-            // if( t &&t->brauchtUpdate() )
+            // if( t &&t->needsUpdate() )
             //     t->updateTextur();
             DXGI_FORMAT f = DXGI_FORMAT_R32_UINT;
             if (zObj->zModelData()->zDXIndexBuffer()->getElementLength() == 2)
@@ -1014,7 +1014,7 @@ void DirectX12::renderObject(Model3D* zObj)
                 v[ 1 ] = *diffuseLights;
                 v[ 2 ] = *pointLights;
                 d3d11Context->PSSetShaderResources( 0, 3, v );
-                d3d11Context->DrawIndexed( indexBuffer->getElementAnzahl(), 0, 0
+                d3d11Context->DrawIndexed( indexBuffer->getElementCount(), 0, 0
                 );*/
                 directCommandQueue->getCommandList()->SetPipelineState(
                     pipeline);
@@ -1038,7 +1038,7 @@ void DirectX12::renderObject(Model3D* zObj)
                 directCommandQueue->getCommandList()->OMSetRenderTargets(
                     1, &rtv, 0, 0);
                 indexBufferView->SizeInBytes
-                    = zObj->zModelData()->zDXIndexBuffer()->getElementAnzahl()
+                    = zObj->zModelData()->zDXIndexBuffer()->getElementCount()
                     * zObj->zModelData()->zDXIndexBuffer()->getElementLength();
                 indexBufferView->BufferLocation
                     = ((DX12Buffer*)zObj->zModelData()->zDXIndexBuffer())
@@ -1047,7 +1047,7 @@ void DirectX12::renderObject(Model3D* zObj)
                 directCommandQueue->getCommandList()->IASetIndexBuffer(
                     indexBufferView);
                 vertexBufferView->SizeInBytes
-                    = zObj->zModelData()->zDXVertexBuffer()->getElementAnzahl()
+                    = zObj->zModelData()->zDXVertexBuffer()->getElementCount()
                     * zObj->zModelData()->zDXVertexBuffer()->getElementLength();
                 vertexBufferView->BufferLocation
                     = ((DX12Buffer*)zObj->zModelData()->zDXVertexBuffer())
@@ -1058,7 +1058,7 @@ void DirectX12::renderObject(Model3D* zObj)
                 directCommandQueue->getCommandList()->IASetPrimitiveTopology(
                     D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
                 directCommandQueue->getCommandList()->DrawIndexedInstanced(
-                    zObj->zModelData()->zDXIndexBuffer()->getElementAnzahl(),
+                    zObj->zModelData()->zDXIndexBuffer()->getElementCount(),
                     1,
                     0,
                     0,
@@ -1072,10 +1072,10 @@ void DirectX12::renderObject(Model3D* zObj)
                 v[ 1 ] = *diffuseLights;
                 v[ 2 ] = *pointLights;
                 d3d11Context->PSSetShaderResources( 0, 3, v );
-                d3d11Context->DrawIndexed( indexBuffer->getElementAnzahl(), 0, 0
+                d3d11Context->DrawIndexed( indexBuffer->getElementCount(), 0, 0
                 ); d3d11Context->RSSetState( texturRS );*/
                 // directCommandQueue->getCommandList()->DrawIndexedInstanced(
-                // indexBuffer->getElementAnzahl(), 1, 0, 0, 0 );
+                // indexBuffer->getElementCount(), 1, 0, 0, 0 );
             }
         }
         ind++;
@@ -1145,10 +1145,10 @@ void DirectX12::renderKamera(Cam3D* zKamera)
     viewAndProj[1] = zKamera->getProjectionMatrix();
     kamPos = zKamera->getWorldPosition();
     if (vertexShader)
-        vertexShader->fuellConstBuffer(
+        vertexShader->fillConstBuffer(
             (char*)viewAndProj, 0, sizeof(Mat4<float>) * 2);
     if (pixelShader)
-        pixelShader->fuellConstBuffer((char*)&kamPos, 2, sizeof(float) * 3);
+        pixelShader->fillConstBuffer((char*)&kamPos, 2, sizeof(float) * 3);
     World3D* w = zKamera->zWorld();
     w->render([this](Model3D* obj) {
         if (isInFrustrum(obj->getPos(), obj->getRadius())) renderObject(obj);
@@ -1162,7 +1162,7 @@ void DirectX12::presentFrame()
     viewAndProj[0] = Mat4<float>::identity();
     viewAndProj[1] = Mat4<float>::identity();
     if (vertexShader)
-        vertexShader->fuellConstBuffer(
+        vertexShader->fillConstBuffer(
             (char*)viewAndProj, 0, sizeof(Mat4<float>) * 2);
 
     uiTexture->updateTextur();
@@ -1217,9 +1217,9 @@ Image* DirectX12::zUIRenderImage() const
 
 bool DirectX12::isAvailable()
 {
-    HINSTANCE dxgiDLL = getDLLRegister()->ladeDLL("dxgi.dll", "dxgi.dll");
+    HINSTANCE dxgiDLL = getDLLRegister()->loadDLL("dxgi.dll", "dxgi.dll");
     if (!dxgiDLL) return 0;
-    HINSTANCE d3d12DLL = getDLLRegister()->ladeDLL("d3d12.dll", "d3d12.dll");
+    HINSTANCE d3d12DLL = getDLLRegister()->loadDLL("d3d12.dll", "d3d12.dll");
     if (!d3d12DLL)
     {
         getDLLRegister()->releaseDLL("dxgi.dll");

DX12Shader.cpp

@@ -29,16 +29,16 @@ DX12Shader::~DX12Shader()
 //  index: The position of the buffer in the buffer array. Existing buffer
 //  is replaced. Buffer 1 cannot be created if buffer 0 has not yet
 //  been created, etc.
-bool DX12Shader::erstelleConstBuffer(int size, int index)
+bool DX12Shader::createConstBuffer(int size, int index)
 {
     if (index < 0 || index >= 14) return 0;
     while ((size / 256) * 256 != size)
         size++;
-    while (!constBuffers->hat(index))
+    while (!constBuffers->has(index))
         constBuffers->add(0);
     constBuffers->set(new DX12VertexBuffer(1, device, copy, direct), index);
     constBuffers->z(index)->setLength(size);
-    constBuffers->z(index)->copieren();
+    constBuffers->z(index)->copyData();
     return 1;
 }
 
@@ -58,7 +58,7 @@ bool DX12Shader::setCompiledByteArray(unsigned char* bytes, int length)
 
 // After calling this function, this shader is used as pixel shader
 //  zD3d11Context: The context object used with the shader
-void DX12Shader::benutzeShader()
+void DX12Shader::useShader()
 {
     // not needet in DirectX 12
 }
@@ -82,7 +82,7 @@ void DX12Shader::getViewDesc(int index, D3D12_CONSTANT_BUFFER_VIEW_DESC& view)
 {
     DX12Buffer* zB = (DX12Buffer*)constBuffers->z(index);
     if (!zB) return;
-    view.SizeInBytes = zB->getElementAnzahl() * zB->getElementLength();
+    view.SizeInBytes = zB->getElementCount() * zB->getElementLength();
     view.BufferLocation = zB->zBuffer()->GetGPUVirtualAddress();
 }
 
@@ -113,7 +113,7 @@ DX12VertexShader::~DX12VertexShader()
 //  zD3d11Device: The device used to create the layout
 //  descArray: An array with initialization data
 //  anz: The number of elements in the array
-bool DX12VertexShader::erstelleInputLayout(
+bool DX12VertexShader::createInputLayout(
     D3D12_INPUT_ELEMENT_DESC* descArray, int anz)
 {
     delete[] inputLayout;

DX12Shader.h

@@ -32,7 +32,7 @@ namespace Framework
         //! \param index The position of the buffer in the buffer array. An
         //! existing buffer will be replaced. Buffer 1 cannot be created
         //! if buffer 0 has not been created yet, etc.
-        virtual bool erstelleConstBuffer(int size, int index) override;
+        virtual bool createConstBuffer(int size, int index) override;
         //! Sets the compiled shader
         //!  zD3d11Device: The device with which the shader should be created
         //! \param bytes The bytes of the compiled code
@@ -42,7 +42,7 @@ namespace Framework
         //! After calling this function, this shader is used as a pixel shader
         //!  zD3d11Context: The context object with which the shader should
         //!  be used
-        void benutzeShader() override;
+        void useShader() override;
         //! Returns the compiled bytes
         unsigned char* getCompiledShader() const;
         //! Returns the number of compiled bytes
@@ -81,7 +81,7 @@ namespace Framework
         //!  zD3d11Device: The device with which the layout should be created
         //! \param descArray An array with initialization data
         //! \param anz The number of elements in the array
-        bool erstelleInputLayout(D3D12_INPUT_ELEMENT_DESC* descArray, int anz);
+        bool createInputLayout(D3D12_INPUT_ELEMENT_DESC* descArray, int anz);
         //! Returns the number of input parameters of the shader
         int getInputLayoutSize() const;
         //! Returns a list of formats for each input value

DX12Texture.cpp

@@ -38,7 +38,7 @@ bool DX12Texture::updateTextur()
         ZeroMemory(&description, sizeof(D3D12_RESOURCE_DESC));
         description.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
         description.Height = bild->getHeight();
-        description.Width = bild->getBreite();
+        description.Width = bild->getWidth();
         description.DepthOrArraySize = 1;
         description.MipLevels = 1;
         description.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
@@ -82,7 +82,7 @@ bool DX12Texture::updateTextur()
             (void**)&intermediate);
         shaderResource = 0;
     }
-    if (bild && (changed || bild->getRend()))
+    if (bild && (changed || bild->getNeedRender()))
     {
         changed = 0;
         if (shaderResource)
@@ -101,7 +101,7 @@ bool DX12Texture::updateTextur()
         }
         D3D12_SUBRESOURCE_DATA textureData = {};
         textureData.pData = bild->getBuffer();
-        textureData.RowPitch = bild->getBreite() * sizeof(int);
+        textureData.RowPitch = bild->getWidth() * sizeof(int);
         textureData.SlicePitch = textureData.RowPitch * bild->getHeight();
         UpdateSubresources(direct->getCommandList(),
             buffer,
@@ -127,7 +127,7 @@ bool DX12Texture::updateTextur()
 }
 
 // Returns true if updateTextur needs to be called
-bool DX12Texture::brauchtUpdate() const
+bool DX12Texture::needsUpdate() const
 {
     return bild && !buffer;
 }

DX12Texture.h

@@ -28,7 +28,7 @@ namespace Framework
         //! to graphics memory
         DLLEXPORT bool updateTextur() override;
         //! Returns true if updateTextur needs to be called
-        DLLEXPORT bool brauchtUpdate() const override;
+        DLLEXPORT bool needsUpdate() const override;
         //! Returns the DX12 resource
         DLLEXPORT ID3D12Resource* getResource();
     };

DX9GraphicsApi.cpp

@@ -54,7 +54,7 @@ void DirectX9::initialize(
         return GraphicsApi::initialize(fenster, backBufferSize, fullScreen);
     GraphicsApi::initialize(fenster, backBufferSize, fullScreen);
 
-    HINSTANCE dll = getDLLRegister()->ladeDLL("d3d9.dll", "d3d9.dll");
+    HINSTANCE dll = getDLLRegister()->loadDLL("d3d9.dll", "d3d9.dll");
     if (!dll)
     {
         WMessageBox(fenster ? fenster->getWindowHandle() : 0,
@@ -88,7 +88,7 @@ void DirectX9::initialize(
     d3dpp.BackBufferHeight = this->backBufferSize.y;
     d3dpp.BackBufferWidth = this->backBufferSize.x;
 
-    uiImage->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0xFF000000);
+    uiImage->newImage(this->backBufferSize.x, this->backBufferSize.y, 0xFF000000);
 
     HRESULT result = pDirect3D->CreateDevice(D3DADAPTER_DEFAULT,
         D3DDEVTYPE_HAL,
@@ -134,11 +134,11 @@ void DirectX9::update()
     d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
     d3dpp.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER;
     if (!backBufferSize.x || !backBufferSize.y)
-        backBufferSize = fenster->getKoerperGroesse();
+        backBufferSize = fenster->getBodySize();
     d3dpp.BackBufferHeight = backBufferSize.y;
     d3dpp.BackBufferWidth = backBufferSize.x;
 
-    uiImage->neuImage(backBufferSize.x, backBufferSize.y, 0xFF000000);
+    uiImage->newImage(backBufferSize.x, backBufferSize.y, 0xFF000000);
 
     HRESULT result = pDirect3D->CreateDevice(D3DADAPTER_DEFAULT,
         D3DDEVTYPE_HAL,
@@ -163,7 +163,7 @@ void DirectX9::update()
 
 void DirectX9::beginFrame(bool fill2D, bool fill3D, int fillColor)
 {
-    if (fill2D) uiImage->setFarbe(fillColor);
+    if (fill2D) uiImage->setColor(fillColor);
 }
 
 void DirectX9::renderKamera(Cam3D* zKamera)
@@ -172,7 +172,7 @@ void DirectX9::renderKamera(Cam3D* zKamera)
     Mat4<float> inv = zKamera->getViewMatrix().getInverse();
     World3D* welt = zKamera->zWorld();
     Timer zm = Timer();
-    zm.messungStart();
+    zm.measureStart();
     for (int x = 0; x < zKamera->zViewPort()->width; x++)
     {
         for (int y = 0; y < zKamera->zViewPort()->height; y++)
@@ -194,7 +194,7 @@ void DirectX9::renderKamera(Cam3D* zKamera)
                 welt->traceRay(wPoint, wDir));
         }
     }
-    zm.messungEnde();
+    zm.measureEnd();
     Logging::error() << zm.getSekunden() << "\n";
 }
 
@@ -213,9 +213,9 @@ void DirectX9::presentFrame()
     }
     // kopieren zum Screen
     int* bgBuff = uiImage->getBuffer();
-    int tmpBr = sizeof(D3DCOLOR) * uiImage->getBreite();
+    int tmpBr = sizeof(D3DCOLOR) * uiImage->getWidth();
     for (int y = 0, pitch = 0, bry = 0; y < uiImage->getHeight();
-         ++y, pitch += backRect->Pitch, bry += uiImage->getBreite())
+         ++y, pitch += backRect->Pitch, bry += uiImage->getWidth())
         memcpy(&((BYTE*)backRect->pBits)[pitch], (void*)&(bgBuff[bry]), tmpBr);
     // Beende Image
     result = pBackBuffer->UnlockRect();

DXBuffer.cpp

@@ -30,20 +30,20 @@ DXBuffer::DXBuffer(int eLen)
 DXBuffer::~DXBuffer() {}
 
 // Sets the changed flag so that data is re-copied on the next call to
-// 'copieren'
+// 'copy'
 void DXBuffer::setChanged()
 {
     changed = 1;
 }
 
-// Changes the length of the buffer on the next call to 'copieren'
+// Changes the length of the buffer on the next call to 'copy'
 //  laen: The length in bytes
 void DXBuffer::setLength(int len)
 {
     this->len = len;
 }
 
-// Sets what will be copied on the next call to 'copieren'
+// Sets what will be copied on the next call to 'copy'
 //  data: A pointer to the data
 void DXBuffer::setData(void* data)
 {
@@ -58,7 +58,7 @@ int DXBuffer::getElementLength() const
 }
 
 // Returns the number of elements in the buffer
-int DXBuffer::getElementAnzahl() const
+int DXBuffer::getElementCount() const
 {
     return len / elLen;
 }
@@ -94,7 +94,7 @@ DX11Buffer::~DX11Buffer()
 
 // Copies the data into the buffer if it has changed
 //  zRObj: The object used to communicate with the graphics card
-void DX11Buffer::copieren(int byteCount)
+void DX11Buffer::copyData(int byteCount)
 {
     if (!len) return;
     if (byteCount < 0) byteCount = len;
@@ -163,10 +163,10 @@ DX11StructuredBuffer::~DX11StructuredBuffer()
 
 // Copies the data into the buffer if it has changed
 //  zRObj: The object used to communicate with the graphics card
-void DX11StructuredBuffer::copieren(int byteCount)
+void DX11StructuredBuffer::copyData(int byteCount)
 {
     ID3D11Buffer* old = buffer;
-    DX11Buffer::copieren(byteCount);
+    DX11Buffer::copyData(byteCount);
     if (buffer != old)
     {
         if (view) view->Release();

DXBuffer.h

@@ -28,26 +28,26 @@ namespace Framework
     public:
         //! Constructor
         //! \param bind The usage of the buffer. Example:
-        //! D3D11_BIND_INDEX_BUFFER, D3D11_BIND_VERTEX_BUFFER. \param eLen Length
-        //! of a single element in bytes
+        //! D3D11_BIND_INDEX_BUFFER, D3D11_BIND_VERTEX_BUFFER. \param eLen
+        //! Length of a single element in bytes
         DLLEXPORT DXBuffer(int eLen);
         //! Destructor
         DLLEXPORT virtual ~DXBuffer();
         //! Sets the changed flag so that the data is copied again on the
-        //! next call of 'copieren'
+        //! next call of 'copy'
         DLLEXPORT void setChanged();
-        //! Changes the length of the buffer on the next call of 'copieren'
+        //! Changes the length of the buffer on the next call of 'copy'
         //! \param len The length in bytes
         DLLEXPORT void setLength(int len);
-        //! Sets what will be copied on the next call of 'copieren'
+        //! Sets what will be copied on the next call of 'copy'
         //! \param data A pointer to the data
         DLLEXPORT void setData(void* data);
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT virtual void copieren(int byteCount = -1) = 0;
+        DLLEXPORT virtual void copyData(int byteCount = -1) = 0;
         //! Returns the length of an element in bytes
         DLLEXPORT int getElementLength() const;
         //! Returns the number of elements in the buffer
-        DLLEXPORT int getElementAnzahl() const;
+        DLLEXPORT int getElementCount() const;
     };
 
 #ifdef WIN32
@@ -70,7 +70,7 @@ namespace Framework
         //! Destructor
         DLLEXPORT virtual ~DX11Buffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT void copieren(int byteCount = -1) override;
+        DLLEXPORT virtual void copyData(int byteCount = -1) override;
         //! Returns the buffer
         DLLEXPORT ID3D11Buffer* zBuffer() const;
     };
@@ -90,7 +90,7 @@ namespace Framework
         //! Destructor
         DLLEXPORT virtual ~DX11StructuredBuffer();
         //! Copies the data into the buffer if it has changed
-        DLLEXPORT void copieren(int byteCount = -1) override;
+        DLLEXPORT void copyData(int byteCount = -1) override;
         //! Returns the used shader resource view
         DLLEXPORT operator ID3D11ShaderResourceView*() const;
     };

DataValidator.cpp

@@ -80,7 +80,7 @@ JSON::JSONValue* TypeMissmatch::getValidPart(
             if (!valid
                 && (!expected->hasAttribute("removeInvalidEntries")
                     || !expected->getAttributeValue("removeInvalidEntries")
-                        .istGleich("true")))
+                        .isEqual("true")))
             {
                 if (removedPartsValidationResults)
                 {
@@ -107,7 +107,7 @@ JSON::JSONValue* TypeMissmatch::getValidPart(
                 p->release();
                 return 0;
             }
-            if (p->hatAt(0, "[") && p->hatAt(p->getLength() - 1, "]"))
+            if (p->hasAt(0, "[") && p->hasAt(p->getLength() - 1, "]"))
             {
                 Text* it = p->getTeilText(1, p->getLength() - 1);
                 int i = (int)*it;
@@ -163,7 +163,7 @@ JSON::JSONValue* TypeMissmatch::getValidPart(
             if (!valid
                 && (!expected->hasAttribute("removeInvalidEntries")
                     || !expected->getAttributeValue("removeInvalidEntries")
-                        .istGleich("true")))
+                        .isEqual("true")))
             {
                 if (removedPartsValidationResults)
                 {
@@ -190,7 +190,7 @@ JSON::JSONValue* TypeMissmatch::getValidPart(
                 p->release();
                 return 0;
             }
-            if (p->hatAt(0, "."))
+            if (p->hasAt(0, "."))
             {
                 if (removedPartsValidationResults)
                 {
@@ -256,7 +256,7 @@ bool TypeMissmatch::isDifferent(const ValidationResult* zResult) const
 {
     const TypeMissmatch* casted = dynamic_cast<const TypeMissmatch*>(zResult);
     if (casted == 0) return 1;
-    if (!casted->getPath().istGleich(path)) return 1;
+    if (!casted->getPath().isEqual(path)) return 1;
     return reason->isDifferent(casted->reason);
 }
 
@@ -318,7 +318,7 @@ bool UnknownValue::isDifferent(const ValidationResult* zResult) const
 {
     const UnknownValue* casted = dynamic_cast<const UnknownValue*>(zResult);
     if (casted == 0) return 1;
-    if (!casted->getPath().istGleich(path)) return 1;
+    if (!casted->getPath().isEqual(path)) return 1;
     return 0;
 }
 
@@ -402,7 +402,7 @@ bool MissingValue::isDifferent(const ValidationResult* zResult) const
 {
     const MissingValue* casted = dynamic_cast<const MissingValue*>(zResult);
     if (casted == 0) return 1;
-    if (!casted->getPath().istGleich(path)) return 1;
+    if (!casted->getPath().isEqual(path)) return 1;
     return 0;
 }
 
@@ -486,7 +486,7 @@ bool MissingOneOf::isDifferent(const ValidationResult* zResult) const
 {
     const MissingOneOf* casted = dynamic_cast<const MissingOneOf*>(zResult);
     if (casted == 0) return 1;
-    if (!casted->getPath().istGleich(path)) return 1;
+    if (!casted->getPath().isEqual(path)) return 1;
     return 0;
 }
 
@@ -553,7 +553,7 @@ JSON::JSONValue* NoTypeMatching::getValidPart(
     {
         removedPartsValidationResults->add(
             dynamic_cast<ValidationResult*>(getThis()));
-        reasons.leeren();
+        reasons.clear();
         for (ValidationResult* error : tempErrors)
         {
             reasons.add(dynamic_cast<ValidationResult*>(error->getThis()));
@@ -572,7 +572,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;
+    if (!casted->getPath().isEqual(path)) return 1;
     for (int i = 0; i < reasons.getEntryCount(); i++)
     {
         if (reasons.z(i)->isDifferent(casted->reasons.z(i))) return 1;
@@ -637,7 +637,7 @@ bool ValidationPathNotFound::isDifferent(const ValidationResult* zResult) const
     const ValidationPathNotFound* other
         = dynamic_cast<const ValidationPathNotFound*>(zResult);
     if (other == 0) return 1;
-    if (!other->path.istGleich(path)) return 1;
+    if (!other->path.isEqual(path)) return 1;
     return 0;
 }
 
@@ -688,7 +688,7 @@ bool ValidValue::isDifferent(const ValidationResult* zResult) const
 {
     const ValidValue* casted = dynamic_cast<const ValidValue*>(zResult);
     if (casted == 0) return 1;
-    if (!casted->getPath().istGleich(path)) return 1;
+    if (!casted->getPath().isEqual(path)) return 1;
     return 0;
 }
 
@@ -803,12 +803,12 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
     XML::Element* zConstraints,
     Text path) const
 {
-    if (zConstraints->getName().istGleich("oneOf"))
+    if (zConstraints->getName().isEqual("oneOf"))
     {
         return validateMultipleTypes(
             pathToValidate, zValue, zConstraints, path);
     }
-    if (zConstraints->getName().istGleich("ref"))
+    if (zConstraints->getName().isEqual("ref"))
     {
         Text id = zConstraints->getAttributeValue("ref");
         XML::Element* e = typeConstraints->z(id, id.getLength());
@@ -827,7 +827,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                 pathToValidate->toString());
         }
         if (!zConstraints->hasAttribute("nullable")
-            || !zConstraints->getAttributeValue("nullable").istGleich("true"))
+            || !zConstraints->getAttributeValue("nullable").isEqual("true"))
         {
             return new TypeMissmatch(path,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -842,7 +842,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
                 pathToValidate->toString());
         }
-        if (!zConstraints->getName().istGleich("bool"))
+        if (!zConstraints->getName().isEqual("bool"))
         {
             return new TypeMissmatch(path,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -851,7 +851,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
         }
         else if (zConstraints->hasAttribute("equals"))
         {
-            if (!zConstraints->getAttributeValue("equals").istGleich("true")
+            if (!zConstraints->getAttributeValue("equals").isEqual("true")
                 == !zValue->asAbstractBool()->getBool())
             {
                 return new TypeMissmatch(path,
@@ -868,7 +868,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
                 pathToValidate->toString());
         }
-        if (!zConstraints->getName().istGleich("number"))
+        if (!zConstraints->getName().isEqual("number"))
         {
             return new TypeMissmatch(path,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -929,7 +929,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
                 pathToValidate->toString());
         }
-        if (!zConstraints->getName().istGleich("string"))
+        if (!zConstraints->getName().isEqual("string"))
         {
             return new TypeMissmatch(path,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -940,7 +940,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
         {
             Text string = zValue->asAbstractString()->getString();
             if (zConstraints->hasAttribute("equals")
-                && !zConstraints->getAttributeValue("equals").istGleich(string))
+                && !zConstraints->getAttributeValue("equals").isEqual(string))
             {
                 return new TypeMissmatch(path,
                     dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -948,7 +948,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                     0);
             }
             if (zConstraints->hasAttribute("contains")
-                && !string.hat(
+                && !string.has(
                     zConstraints->getAttributeValue("contains").getText()))
             {
                 return new TypeMissmatch(path,
@@ -957,7 +957,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                     0);
             }
             if (zConstraints->hasAttribute("startsWith")
-                && string.positionVon(
+                && string.positionOf(
                        zConstraints->getAttributeValue("startsWith").getText())
                        != 0)
             {
@@ -967,7 +967,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                     0);
             }
             if (zConstraints->hasAttribute("endsWith")
-                && !string.hatAt(
+                && !string.hasAt(
                     string.getLength()
                         - zConstraints->getAttributeValue("endsWith")
                             .getLength(),
@@ -986,7 +986,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                 bool ok = 0;
                 for (JSON::JSONValue* v : *array)
                 {
-                    if (v->asString()->getString().istGleich(string))
+                    if (v->asString()->getString().isEqual(string))
                     {
                         ok = 1;
                         break;
@@ -1004,7 +1004,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
         }
         break;
     case AbstractType::ARRAY:
-        if (!zConstraints->getName().istGleich("array"))
+        if (!zConstraints->getName().isEqual("array"))
         {
             return new TypeMissmatch(path,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -1080,7 +1080,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
         }
         break;
     case AbstractType::OBJECT:
-        if (!zConstraints->getName().istGleich("object"))
+        if (!zConstraints->getName().isEqual("object"))
         {
             return new TypeMissmatch(path,
                 dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -1115,7 +1115,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                     {
                         if (!zConstraints
                                 ->getAttributeValue("allowAdditionalAttributes")
-                                .istGleich("true"))
+                                .isEqual("true"))
                         {
                             return new TypeMissmatch(path,
                                 dynamic_cast<AbstractElement*>(
@@ -1151,7 +1151,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                 {
                     if (!zConstraints
                             ->getAttributeValue("allowAdditionalAttributes")
-                            .istGleich("true"))
+                            .isEqual("true"))
                     {
                         return new TypeMissmatch(path,
                             dynamic_cast<AbstractElement*>(zValue->getThis()),
@@ -1191,10 +1191,10 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                     std::function<void(XML::Element*)> checkOptional;
                     checkOptional = [&optional, &checkOptional](
                                         XML::Element* zElement) {
-                        if (zElement->getName().istGleich("oneOf")
+                        if (zElement->getName().isEqual("oneOf")
                             && (!zElement->hasAttribute("optional")
                                 || !zElement->getAttributeValue("optional")
-                                    .istGleich("true")))
+                                    .isEqual("true")))
                         {
                             XML::Editor tmp = zElement->selectChildren();
                             tmp.forEach(checkOptional);
@@ -1203,7 +1203,7 @@ ValidationResult* DataValidator::validate(ElementPath* pathToValidate,
                         {
                             optional &= zElement->hasAttribute("optional")
                                      && zElement->getAttributeValue("optional")
-                                            .istGleich("true");
+                                            .isEqual("true");
                         }
                     };
                     tmp.forEach(checkOptional);
@@ -1311,7 +1311,7 @@ ValidationResult* DataValidator::validateMultipleTypes(
             invalidResults);
     }
     // try all types
-    possibleConstraints.leeren();
+    possibleConstraints.clear();
     RCArray<ValidationResult> invalidResults;
     int index = pathToValidate->getCurrentPathElementIndex();
     for (XML::Element* constraint : zPossibleChildConstraints->selectChildren())
@@ -1346,7 +1346,7 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
     if (zConstraint->hasAttribute("id"))
     {
         Text id = zConstraint->getAttributeValue("id");
-        id.ersetzen(" ", "_");
+        id.replace(" ", "_");
         if (zDefs->hasValue(id))
         {
             Text jsonRef = Text("#/$defs/") + id;
@@ -1356,13 +1356,13 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
         zDefs->addValue(id, new JSON::JSONValue()); // avoid endless recursion
                                                     // for cyclic datastructures
     }
-    if (zConstraint->getName().istGleich("bool"))
+    if (zConstraint->getName().isEqual("bool"))
     {
         if (zConstraint->hasAttribute("equals"))
         {
             JSON::JSONArray* array = new JSON::JSONArray();
             array->addValue(new JSON::JSONBool(
-                zConstraint->getAttributeValue("equals").istGleich("true")));
+                zConstraint->getAttributeValue("equals").isEqual("true")));
             result->addValue("enum", array);
         }
         else
@@ -1370,7 +1370,7 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
             result->addValue("type", new JSON::JSONString("boolean"));
         }
     }
-    else if (zConstraint->getName().istGleich("number"))
+    else if (zConstraint->getName().isEqual("number"))
     {
         if (zConstraint->hasAttribute("equals"))
         {
@@ -1410,7 +1410,7 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
             }
         }
     }
-    else if (zConstraint->getName().istGleich("string"))
+    else if (zConstraint->getName().isEqual("string"))
     {
         if (zConstraint->hasAttribute("equals"))
         {
@@ -1458,11 +1458,11 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
             }
         }
     }
-    else if (zConstraint->getName().istGleich("ref"))
+    else if (zConstraint->getName().isEqual("ref"))
     {
         Text id = zConstraint->getAttributeValue("ref");
         XML::Element* e = typeConstraints->z(id, id.getLength());
-        id.ersetzen(" ", "_");
+        id.replace(" ", "_");
         if (!zDefs->hasValue(id))
         {
             JSON::JSONObject* def = getJsonSchema(e, zDefs);
@@ -1479,13 +1479,13 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
         Text jsonRef = Text("#/$defs/") + id;
         result->addValue("$ref", new JSON::JSONString(jsonRef));
     }
-    else if (zConstraint->getName().istGleich("object"))
+    else if (zConstraint->getName().isEqual("object"))
     {
         result->addValue("type", new JSON::JSONString("object"));
         result->addValue("additionalProperties",
             new JSON::JSONBool(
                 zConstraint->getAttributeValue("allowAdditionalAttributes")
-                    .istGleich("true")));
+                    .isEqual("true")));
         JSON::JSONObject* properties = new JSON::JSONObject();
         JSON::JSONArray* required = new JSON::JSONArray();
         for (XML::Element* e : zConstraint->selectChildren())
@@ -1497,7 +1497,7 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
             {
                 oneOf->addValue(getJsonSchema(child, zDefs));
                 isRequired
-                    &= !child->getAttributeValue("optional").istGleich("true")
+                    &= !child->getAttributeValue("optional").isEqual("true")
                     && !child->hasAttribute("default");
             }
             prop->addValue("oneOf", oneOf);
@@ -1511,7 +1511,7 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
         result->addValue("properties", properties);
         result->addValue("required", required);
     }
-    else if (zConstraint->getName().istGleich("array"))
+    else if (zConstraint->getName().isEqual("array"))
     {
         result->addValue("type", new JSON::JSONString("array"));
         JSON::JSONObject* items = new JSON::JSONObject();
@@ -1535,7 +1535,7 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
         items->addValue("oneOf", oneOf);
         result->addValue("items", items);
     }
-    else if (zConstraint->getName().istGleich("oneOf"))
+    else if (zConstraint->getName().isEqual("oneOf"))
     {
         JSON::JSONArray* oneOf = new JSON::JSONArray();
         for (XML::Element* e : zConstraint->selectChildren())
@@ -1545,7 +1545,7 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
         result->addValue("oneOf", oneOf);
     }
     if (zConstraint->hasAttribute("nullable")
-        && zConstraint->getAttributeValue("nullable").istGleich("true"))
+        && zConstraint->getAttributeValue("nullable").isEqual("true"))
     {
         if (!result->hasValue("type"))
         {
@@ -1586,7 +1586,7 @@ JSON::JSONObject* Framework::Validator::DataValidator::getJsonSchema(
     if (zConstraint->hasAttribute("id"))
     {
         Text id = zConstraint->getAttributeValue("id");
-        id.ersetzen(" ", "_");
+        id.replace(" ", "_");
         zDefs->removeValue(id);
         zDefs->addValue(id, result);
         result = new JSON::JSONObject();

Diagram.cpp

@@ -18,7 +18,7 @@ using namespace Framework;
 LineDiagram::LineDiagram()
     : DrawableBackground(),
       gF(0xFF000000),
-      lFarbe(new Array<int>()),
+      lColor(new Array<int>()),
       lName(new RCArray<Text>()),
       ph(new RCArray<Array<int>>()),
       pb(new RCArray<Array<int>>()),
@@ -33,7 +33,7 @@ LineDiagram::LineDiagram()
 // Destructor
 LineDiagram::~LineDiagram()
 {
-    lFarbe->release();
+    lColor->release();
     lName->release();
     ph->release();
     pb->release();
@@ -48,52 +48,52 @@ void LineDiagram::setTextRendererZ(TextRenderer* textRd)
     this->textRd = textRd;
 }
 
-void LineDiagram::setFontZ(Font* schrift) // sets the font
+void LineDiagram::setFontZ(Font* font) // sets the font
 {
     if (!this->textRd)
-        textRd = new TextRenderer(schrift);
+        textRd = new TextRenderer(font);
     else
-        textRd->setFontZ(schrift);
+        textRd->setFontZ(font);
     rend = 1;
 }
 
-void LineDiagram::setGSize(Punkt& gr) // sets the grid size
+void LineDiagram::setGSize(Point& gr) // sets the grid size
 {
     gitterGr = gr;
     rend = 1;
 }
 
-void LineDiagram::setGFarbe(int f) // sets the grid color
+void LineDiagram::setGColor(int f) // sets the grid color
 {
     gF = f;
     rend = 1;
 }
 
-void LineDiagram::addLinie(const char* name) // adds a line
+void LineDiagram::addLine(const char* name) // adds a line
 {
-    addLinie(new Text(name));
+    addLine(new Text(name));
     rend = 1;
 }
 
-void LineDiagram::addLinie(Text* txt)
+void LineDiagram::addLine(Text* txt)
 {
-    lFarbe->add(0xFFFFFFFF, lines);
+    lColor->add(0xFFFFFFFF, lines);
     lName->add(txt, lines);
     ph->add(new Array<int>(), lines);
     pb->add(new Array<int>(), lines);
-    int rbr = rahmen && hatStyle(Style::Border) ? rahmen->getRBreite() : 0;
+    int rbr = border && hasStyle(Style::Border) ? border->getRWidth() : 0;
     pb->z(lines)->set(gr.x - rbr * 2, 0);
     ++lines;
     rend = 1;
 }
 
-void LineDiagram::setLFarbe(int lNum, int f) // sets the line color
+void LineDiagram::setLColor(int lNum, int f) // sets the line color
 {
-    lFarbe->set(f, lNum);
+    lColor->set(f, lNum);
     rend = 1;
 }
 
-void LineDiagram::addPunkt(int lNum, int x, int h) // adds a point
+void LineDiagram::addPoint(int lNum, int x, int h) // adds a point
 {
     Array<int>* ph_tmp = ph->z(lNum);
     Array<int>* pb_tmp = pb->z(lNum);
@@ -120,9 +120,9 @@ void LineDiagram::addPunkt(int lNum, int x, int h) // adds a point
     rend = 1;
 }
 
-void LineDiagram::removeLinie(int lNum) // removes a line
+void LineDiagram::removeLine(int lNum) // removes a line
 {
-    lFarbe->remove(lNum);
+    lColor->remove(lNum);
     lName->remove(lNum);
     ph->remove(lNum);
     pb->remove(lNum);
@@ -132,7 +132,7 @@ void LineDiagram::removeLinie(int lNum) // removes a line
 
 void LineDiagram::render(Image& zRObj) // draws to zRObj
 {
-    if (hatStyle(Style::Sichtbar))
+    if (hasStyle(Style::Visible))
     {
         lockDrawable();
         removeStyle(Style::VScroll | Style::HScroll);
@@ -145,37 +145,37 @@ void LineDiagram::render(Image& zRObj) // draws to zRObj
         int hv = getHighestValue();
         hv = hv ? hv : 1;
         double yFaktor = innenSize.y / hv;
-        if (hatStyle(Style::Gitter))
+        if (hasStyle(Style::Gitter))
         {
             double ghi = gitterGr.y * yFaktor;
             int yo = innenSize.y - 1;
             int bo = innenSize.x, ho = innenSize.y;
             int maxBr = (int)((double)innenSize.x / gitterGr.x + 0.5);
             int maxHi = ghi ? (int)(innenSize.y / ghi + 0.5) : 0;
-            if (hatStyle(Style::HAlpha))
+            if (hasStyle(Style::HAlpha))
             {
                 for (int i = 0; i < maxBr; ++i)
-                    zRObj.drawLinieVAlpha(gitterGr.x * i, 0, ho, gF);
+                    zRObj.drawLineVAlpha(gitterGr.x * i, 0, ho, gF);
                 for (int i = 0; i < maxHi; ++i)
-                    zRObj.drawLinieHAlpha(0, (int)(yo - ghi * i + 0.5), bo, gF);
+                    zRObj.drawLineHAlpha(0, (int)(yo - ghi * i + 0.5), bo, gF);
             }
             else
             {
                 for (int i = 0; i < maxBr; ++i)
-                    zRObj.drawLinieV(gitterGr.x * i, 0, ho, gF);
+                    zRObj.drawLineV(gitterGr.x * i, 0, ho, gF);
                 for (int i = 0; i < maxHi; ++i)
-                    zRObj.drawLinieH(0, (int)(yo - ghi * i + 0.5), bo, gF);
+                    zRObj.drawLineH(0, (int)(yo - ghi * i + 0.5), bo, gF);
             }
         }
         for (int i = 0; i < lines; ++i)
         {
-            int f_tmp = lFarbe->hat(i) ? lFarbe->get(i) : 0;
+            int f_tmp = lColor->has(i) ? lColor->get(i) : 0;
             Text* n_tmp = lName->z(i);
             Array<int>* ph_tmp = ph->z(i);
             Array<int>* pb_tmp = pb->z(i);
-            if (hatStyle(Style::LinienName) && textRd && n_tmp)
+            if (hasStyle(Style::LineName) && textRd && n_tmp)
             {
-                textRd->setSchriftSize(12);
+                textRd->setFontSize(12);
                 Text rtxt = n_tmp->getText();
                 rtxt += ": ";
                 rtxt += lastValue->get(i);
@@ -195,12 +195,12 @@ void LineDiagram::render(Image& zRObj) // draws to zRObj
                              - (int)(ph_tmp->get(ii) * yFaktor + 0.5) - 1;
                     if (ypos == -1) ++ypos;
                     if (ypos < 0 || xpos < 0) break;
-                    if (hatStyle(Style::HAlpha))
-                        zRObj.drawLinieAlpha(
-                            Punkt(lastX, lastY), Punkt(xpos, ypos), f_tmp);
+                    if (hasStyle(Style::HAlpha))
+                        zRObj.drawLineAlpha(
+                            Point(lastX, lastY), Point(xpos, ypos), f_tmp);
                     else
-                        zRObj.drawLinie(
-                            Punkt(lastX, lastY), Punkt(xpos, ypos), f_tmp);
+                        zRObj.drawLine(
+                            Point(lastX, lastY), Point(xpos, ypos), f_tmp);
                     lastX = xpos;
                     lastY = ypos;
                 }
@@ -223,30 +223,30 @@ Font* LineDiagram::zFont() const
     return textRd ? textRd->zFont() : 0;
 }
 
-const Punkt& LineDiagram::getGSize() const // returns the grid size
+const Point& LineDiagram::getGSize() const // returns the grid size
 {
     return gitterGr;
 }
 
-int LineDiagram::getGFarbe() const // returns the grid color
+int LineDiagram::getGColor() const // returns the grid color
 {
     return gF;
 }
 
-int LineDiagram::getLinienNummer(const char* name) const // returns the line number
+int LineDiagram::getLineNumber(const char* name) const // returns the line number
 {
     for (int i = 0; i < lines; ++i)
     {
-        if (lName->z(i)->istGleich(name)) return i;
+        if (lName->z(i)->isEqual(name)) return i;
     }
     return -1;
 }
 
-int LineDiagram::getLinienNummer(Text* name) const
+int LineDiagram::getLineNumber(Text* name) const
 {
     for (int i = 0; i < lines; ++i)
     {
-        if (lName->z(i)->istGleich(name->getText()))
+        if (lName->z(i)->isEqual(name->getText()))
         {
             name->release();
             return i;
@@ -256,12 +256,12 @@ int LineDiagram::getLinienNummer(Text* name) const
     return -1;
 }
 
-Text* LineDiagram::getLinienName(int lNum) const // returns the line name
+Text* LineDiagram::getLineName(int lNum) const // returns the line name
 {
     return lName->get(lNum);
 }
 
-Text* LineDiagram::zLinienNamen(int lNum) const
+Text* LineDiagram::zLineNames(int lNum) const
 {
     return lName->z(lNum);
 }
@@ -298,7 +298,7 @@ int LineDiagram::getMedian(int lNum) const // returns the average value
     return (int)((double)all / count + 0.5);
 }
 
-int LineDiagram::getLAnzahl() const // returns the number of lines
+int LineDiagram::getLCount() const // returns the number of lines
 {
     return lines;
 }
@@ -313,8 +313,8 @@ int LineDiagram::getLastValue(int lNum) const // returns the last value
 DiagramValue::DiagramValue()
     : ReferenceCounter(),
       style(0),
-      farbe(0xFFFFFFFF),
-      hintergrund(0),
+      color(0xFFFFFFFF),
+      background(0),
       name(new Text()),
       punkte(new Array<DiagramPoint*>)
 {}
@@ -326,7 +326,7 @@ DiagramValue::~DiagramValue()
     int anz = punkte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (punkte->hat(i)) delete punkte->get(i);
+        if (punkte->has(i)) delete punkte->get(i);
     }
     punkte->release();
 }
@@ -337,31 +337,31 @@ DiagramData::DiagramData()
     : ReferenceCounter(),
       style(0),
       rasterDicke(0),
-      rasterBreite(0),
+      gridWidth(0),
       rasterHeight(0),
-      rasterFarbe(0),
-      hIntervallFarbe(0xFFFFFFFF),
-      vIntervallFarbe(0xFFFFFFFF),
-      hIntervallName(new Text()),
-      vIntervallName(new Text()),
-      hIntervallTexte(new RCArray<Text>),
-      vIntervallTexte(new RCArray<Text>),
-      hIntervallWerte(new Array<double>),
-      vIntervallWerte(new Array<double>),
-      hIntervallBreite(0),
-      vIntervallHeight(0),
+      rasterColor(0),
+      hIntervalColor(0xFFFFFFFF),
+      vIntervalColor(0xFFFFFFFF),
+      hIntervalName(new Text()),
+      vIntervalName(new Text()),
+      hIntervalTexte(new RCArray<Text>),
+      vIntervalTexte(new RCArray<Text>),
+      hIntervalWerte(new Array<double>),
+      vIntervalWerte(new Array<double>),
+      hIntervalWidth(0),
+      vIntervalHeight(0),
       werte(new RCArray<DiagramValue>())
 {}
 
 // Destructor
 DiagramData::~DiagramData()
 {
-    hIntervallName->release();
-    vIntervallName->release();
-    hIntervallWerte->release();
-    vIntervallWerte->release();
-    hIntervallTexte->release();
-    vIntervallTexte->release();
+    hIntervalName->release();
+    vIntervalName->release();
+    hIntervalWerte->release();
+    vIntervalWerte->release();
+    hIntervalTexte->release();
+    vIntervalTexte->release();
     werte->release();
 }
 
@@ -395,27 +395,27 @@ void BaseDiagram::setDiagramData(DiagramData* dd) // copies the diagram data
     lock->lock();
     if (!daten) daten = new DiagramData();
     daten->style = dd->style;
-    daten->rasterBreite = dd->rasterBreite;
+    daten->gridWidth = dd->gridWidth;
     daten->rasterHeight = dd->rasterHeight;
-    daten->rasterFarbe = dd->rasterFarbe;
-    daten->hIntervallFarbe = dd->hIntervallFarbe;
-    daten->vIntervallFarbe = dd->vIntervallFarbe;
-    daten->hIntervallName->setText(*dd->hIntervallName);
-    daten->vIntervallName->setText(*dd->vIntervallName);
-    int anz = dd->hIntervallWerte->getEntryCount();
+    daten->rasterColor = dd->rasterColor;
+    daten->hIntervalColor = dd->hIntervalColor;
+    daten->vIntervalColor = dd->vIntervalColor;
+    daten->hIntervalName->setText(*dd->hIntervalName);
+    daten->vIntervalName->setText(*dd->vIntervalName);
+    int anz = dd->hIntervalWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (dd->hIntervallWerte->hat(i))
-            daten->hIntervallWerte->set(dd->hIntervallWerte->get(i), i);
+        if (dd->hIntervalWerte->has(i))
+            daten->hIntervalWerte->set(dd->hIntervalWerte->get(i), i);
     }
-    anz = dd->vIntervallWerte->getEntryCount();
+    anz = dd->vIntervalWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (dd->vIntervallWerte->hat(i))
-            daten->vIntervallWerte->set(dd->vIntervallWerte->get(i), i);
+        if (dd->vIntervalWerte->has(i))
+            daten->vIntervalWerte->set(dd->vIntervalWerte->get(i), i);
     }
-    daten->hIntervallBreite = dd->hIntervallBreite;
-    daten->vIntervallHeight = dd->vIntervallHeight;
+    daten->hIntervalWidth = dd->hIntervalWidth;
+    daten->vIntervalHeight = dd->vIntervalHeight;
     anz = dd->werte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
@@ -424,17 +424,17 @@ void BaseDiagram::setDiagramData(DiagramData* dd) // copies the diagram data
         {
             DiagramValue* w = new DiagramValue();
             w->style = tmp->style;
-            w->farbe = tmp->farbe;
-            w->hintergrund = tmp->hintergrund;
+            w->color = tmp->color;
+            w->background = tmp->background;
             w->name->setText(tmp->name->getText());
             int anz = tmp->punkte->getEntryCount();
             for (int j = 0; j < anz; ++j)
             {
-                if (tmp->punkte->hat(j))
+                if (tmp->punkte->has(j))
                 {
                     DiagramPoint* p = new DiagramPoint();
-                    p->hIntervall = tmp->punkte->get(j)->hIntervall;
-                    p->vIntervall = tmp->punkte->get(j)->vIntervall;
+                    p->hInterval = tmp->punkte->get(j)->hInterval;
+                    p->vInterval = tmp->punkte->get(j)->vInterval;
                     w->punkte->set(p, j);
                 }
             }
@@ -446,7 +446,7 @@ void BaseDiagram::setDiagramData(DiagramData* dd) // copies the diagram data
     changed = 1;
 }
 
-void BaseDiagram::setRasterDicke(int d) // set raster thickness
+void BaseDiagram::setGridThickness(int d) // set raster thickness
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
@@ -455,16 +455,16 @@ void BaseDiagram::setRasterDicke(int d) // set raster thickness
     lock->unlock();
 }
 
-void BaseDiagram::setRasterBreite(int br) // set raster width
+void BaseDiagram::setGridWidth(int br) // set raster width
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    if (daten->rasterBreite != br) changed = 1;
-    daten->rasterBreite = br;
+    if (daten->gridWidth != br) changed = 1;
+    daten->gridWidth = br;
     lock->unlock();
 }
 
-void BaseDiagram::setRasterHeight(int hi) // set raster height
+void BaseDiagram::setGridHeight(int hi) // set raster height
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
@@ -473,178 +473,178 @@ void BaseDiagram::setRasterHeight(int hi) // set raster height
     lock->unlock();
 }
 
-void BaseDiagram::setRasterFarbe(int f) // set raster color
+void BaseDiagram::setGridColor(int f) // set raster color
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    if (daten->rasterFarbe != f) changed = 1;
-    daten->rasterFarbe = f;
+    if (daten->rasterColor != f) changed = 1;
+    daten->rasterColor = f;
     lock->unlock();
 }
 
-void BaseDiagram::setHIntervallBreite(double br) // interval width
+void BaseDiagram::setHIntervalWidth(double br) // interval width
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    daten->hIntervallBreite = br;
+    daten->hIntervalWidth = br;
     lock->unlock();
 }
 
-void BaseDiagram::setVIntervallHeight(double hi) // interval height
+void BaseDiagram::setVIntervalHeight(double hi) // interval height
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    daten->vIntervallHeight = hi;
+    daten->vIntervalHeight = hi;
     lock->unlock();
 }
 
-void BaseDiagram::setHIntervallFarbe(int f) // color of the horizontal interval
+void BaseDiagram::setHIntervalColor(int f) // color of the horizontal interval
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    if (daten->hIntervallFarbe != f) changed = 1;
-    daten->hIntervallFarbe = f;
+    if (daten->hIntervalColor != f) changed = 1;
+    daten->hIntervalColor = f;
     lock->unlock();
 }
 
-void BaseDiagram::setVIntervallFarbe(int f) // color of the vertical interval
+void BaseDiagram::setVIntervalColor(int f) // color of the vertical interval
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    if (daten->vIntervallFarbe != f) changed = 1;
-    daten->vIntervallFarbe = f;
+    if (daten->vIntervalColor != f) changed = 1;
+    daten->vIntervalColor = f;
     lock->unlock();
 }
 
-void BaseDiagram::setHIntervallName(
+void BaseDiagram::setHIntervalName(
     const char* name) // Sets the name of the horizontal interval
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    if (!daten->hIntervallName) daten->hIntervallName = new Text();
-    if (!daten->hIntervallName->istGleich(name)) changed = 1;
-    daten->hIntervallName->setText(name);
+    if (!daten->hIntervalName) daten->hIntervalName = new Text();
+    if (!daten->hIntervalName->isEqual(name)) changed = 1;
+    daten->hIntervalName->setText(name);
     lock->unlock();
 }
 
-void BaseDiagram::setHIntervallName(Text* name)
+void BaseDiagram::setHIntervalName(Text* name)
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    if (!daten->hIntervallName) daten->hIntervallName = new Text();
-    if (!daten->hIntervallName->istGleich(*name)) changed = 1;
-    daten->hIntervallName->setText(*name);
+    if (!daten->hIntervalName) daten->hIntervalName = new Text();
+    if (!daten->hIntervalName->isEqual(*name)) changed = 1;
+    daten->hIntervalName->setText(*name);
     name->release();
     lock->unlock();
 }
 
-void BaseDiagram::setVIntervallName(
+void BaseDiagram::setVIntervalName(
     const char* name) // Sets the name of the vertical interval
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    if (!daten->vIntervallName) daten->vIntervallName = new Text();
-    if (!daten->vIntervallName->istGleich(name)) changed = 1;
-    daten->vIntervallName->setText(name);
+    if (!daten->vIntervalName) daten->vIntervalName = new Text();
+    if (!daten->vIntervalName->isEqual(name)) changed = 1;
+    daten->vIntervalName->setText(name);
     lock->unlock();
 }
 
-void BaseDiagram::setVIntervallName(Text* name)
+void BaseDiagram::setVIntervalName(Text* name)
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
-    if (!daten->vIntervallName) daten->vIntervallName = new Text();
-    if (!daten->vIntervallName->istGleich(*name)) changed = 1;
-    daten->vIntervallName->setText(*name);
+    if (!daten->vIntervalName) daten->vIntervalName = new Text();
+    if (!daten->vIntervalName->isEqual(*name)) changed = 1;
+    daten->vIntervalName->setText(*name);
     name->release();
     lock->unlock();
 }
 
-void BaseDiagram::addHIntervallText(double hIntervall,
+void BaseDiagram::addHIntervalText(double hInterval,
     const char* text) // Add text for a horizontal interval
 {
-    setHIntervallText(hIntervall, text);
+    setHIntervalText(hInterval, text);
 }
 
-void BaseDiagram::addHIntervallText(double hIntervall, Text* text)
+void BaseDiagram::addHIntervalText(double hInterval, Text* text)
 {
-    setHIntervallText(hIntervall, *text);
+    setHIntervalText(hInterval, *text);
     text->release();
 }
 
-void BaseDiagram::setHIntervallTextZ(double hIntervall,
+void BaseDiagram::setHIntervalTextZ(double hInterval,
     Text* text) // Sets the text of a horizontal interval
 {
     lock->lock();
     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->getEntryCount();
+    if (!daten->hIntervalWerte) daten->hIntervalWerte = new Array<double>();
+    if (!daten->hIntervalTexte) daten->hIntervalTexte = new RCArray<Text>();
+    int anz = daten->hIntervalWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (daten->hIntervallWerte->hat(i)
-            && daten->hIntervallWerte->get(i) == hIntervall)
+        if (daten->hIntervalWerte->has(i)
+            && daten->hIntervalWerte->get(i) == hInterval)
         {
-            daten->hIntervallTexte->set(text, i);
+            daten->hIntervalTexte->set(text, i);
             lock->unlock();
             changed = 1;
             return;
         }
     }
-    daten->hIntervallWerte->set(hIntervall, anz);
-    daten->hIntervallTexte->set(text, anz);
+    daten->hIntervalWerte->set(hInterval, anz);
+    daten->hIntervalTexte->set(text, anz);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiagram::setHIntervallText(double hIntervall, Text* text)
+void BaseDiagram::setHIntervalText(double hInterval, Text* text)
 {
-    setHIntervallText(hIntervall, *text);
+    setHIntervalText(hInterval, *text);
     text->release();
 }
 
-void BaseDiagram::setHIntervallText(double hIntervall, const char* text)
+void BaseDiagram::setHIntervalText(double hInterval, const char* text)
 {
     lock->lock();
     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->getEntryCount();
+    if (!daten->hIntervalWerte) daten->hIntervalWerte = new Array<double>();
+    if (!daten->hIntervalTexte) daten->hIntervalTexte = new RCArray<Text>();
+    int anz = daten->hIntervalWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (daten->hIntervallWerte->hat(i)
-            && daten->hIntervallWerte->get(i) == hIntervall)
+        if (daten->hIntervalWerte->has(i)
+            && daten->hIntervalWerte->get(i) == hInterval)
         {
-            if (!daten->hIntervallTexte->z(i))
-                daten->hIntervallTexte->set(new Text(text), i);
+            if (!daten->hIntervalTexte->z(i))
+                daten->hIntervalTexte->set(new Text(text), i);
             else
-                daten->hIntervallTexte->z(i)->setText(text);
+                daten->hIntervalTexte->z(i)->setText(text);
             lock->unlock();
             changed = 1;
             return;
         }
     }
-    daten->hIntervallWerte->set(hIntervall, anz);
-    daten->hIntervallTexte->set(new Text(text), anz);
+    daten->hIntervalWerte->set(hInterval, anz);
+    daten->hIntervalTexte->set(new Text(text), anz);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiagram::removeHIntervallText(
-    double hIntervall) // removes the text of a horizontal interval
+void BaseDiagram::removeHIntervalText(
+    double hInterval) // removes the text of a horizontal interval
 {
     lock->lock();
     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->getEntryCount();
+    if (!daten->hIntervalWerte) daten->hIntervalWerte = new Array<double>();
+    if (!daten->hIntervalTexte) daten->hIntervalTexte = new RCArray<Text>();
+    int anz = daten->hIntervalWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (daten->hIntervallWerte->hat(i)
-            && daten->hIntervallWerte->get(i) == hIntervall)
+        if (daten->hIntervalWerte->has(i)
+            && daten->hIntervalWerte->get(i) == hInterval)
         {
-            daten->hIntervallTexte->remove(i);
-            daten->hIntervallWerte->remove(i);
+            daten->hIntervalTexte->remove(i);
+            daten->hIntervalWerte->remove(i);
             lock->unlock();
             changed = 1;
             return;
@@ -653,91 +653,91 @@ void BaseDiagram::removeHIntervallText(
     lock->unlock();
 }
 
-void BaseDiagram::addVIntervallText(double vIntervall,
+void BaseDiagram::addVIntervalText(double vInterval,
     const char* text) // Add text for a vertical interval
 {
-    setVIntervallText(vIntervall, text);
+    setVIntervalText(vInterval, text);
 }
 
-void BaseDiagram::addVIntervallText(double vIntervall, Text* text)
+void BaseDiagram::addVIntervalText(double vInterval, Text* text)
 {
-    setVIntervallText(vIntervall, *text);
+    setVIntervalText(vInterval, *text);
     text->release();
 }
 
-void BaseDiagram::setVIntervallTextZ(
-    double vIntervall, Text* text) // Sets the text of a vertical interval
+void BaseDiagram::setVIntervalTextZ(
+    double vInterval, Text* text) // Sets the text of a vertical interval
 {
     lock->lock();
     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->getEntryCount();
+    if (!daten->vIntervalWerte) daten->vIntervalWerte = new Array<double>();
+    if (!daten->vIntervalTexte) daten->vIntervalTexte = new RCArray<Text>();
+    int anz = daten->vIntervalWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (daten->vIntervallWerte->hat(i)
-            && daten->vIntervallWerte->get(i) == vIntervall)
+        if (daten->vIntervalWerte->has(i)
+            && daten->vIntervalWerte->get(i) == vInterval)
         {
-            daten->vIntervallTexte->set(text, i);
+            daten->vIntervalTexte->set(text, i);
             lock->unlock();
             changed = 1;
             return;
         }
     }
-    daten->vIntervallWerte->set(vIntervall, anz);
-    daten->vIntervallTexte->set(text, anz);
+    daten->vIntervalWerte->set(vInterval, anz);
+    daten->vIntervalTexte->set(text, anz);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiagram::setVIntervallText(double vIntervall, Text* text)
+void BaseDiagram::setVIntervalText(double vInterval, Text* text)
 {
-    setVIntervallText(vIntervall, *text);
+    setVIntervalText(vInterval, *text);
     text->release();
 }
 
-void BaseDiagram::setVIntervallText(double vIntervall, const char* text)
+void BaseDiagram::setVIntervalText(double vInterval, const char* text)
 {
     lock->lock();
     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->getEntryCount();
+    if (!daten->vIntervalWerte) daten->vIntervalWerte = new Array<double>();
+    if (!daten->vIntervalTexte) daten->vIntervalTexte = new RCArray<Text>();
+    int anz = daten->vIntervalWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (daten->vIntervallWerte->hat(i)
-            && daten->vIntervallWerte->get(i) == vIntervall)
+        if (daten->vIntervalWerte->has(i)
+            && daten->vIntervalWerte->get(i) == vInterval)
         {
-            if (!daten->vIntervallTexte->z(i))
-                daten->vIntervallTexte->set(new Text(text), i);
+            if (!daten->vIntervalTexte->z(i))
+                daten->vIntervalTexte->set(new Text(text), i);
             else
-                daten->vIntervallTexte->z(i)->setText(text);
+                daten->vIntervalTexte->z(i)->setText(text);
             lock->unlock();
             changed = 1;
             return;
         }
     }
-    daten->vIntervallWerte->set(vIntervall, anz);
-    daten->vIntervallTexte->set(new Text(text), anz);
+    daten->vIntervalWerte->set(vInterval, anz);
+    daten->vIntervalTexte->set(new Text(text), anz);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiagram::removeVIntervallText(
-    double vIntervall) // removes the text of a vertical interval
+void BaseDiagram::removeVIntervalText(
+    double vInterval) // removes the text of a vertical interval
 {
     lock->lock();
     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->getEntryCount();
+    if (!daten->vIntervalWerte) daten->vIntervalWerte = new Array<double>();
+    if (!daten->vIntervalTexte) daten->vIntervalTexte = new RCArray<Text>();
+    int anz = daten->vIntervalWerte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (daten->vIntervallWerte->hat(i)
-            && daten->vIntervallWerte->get(i) == vIntervall)
+        if (daten->vIntervalWerte->has(i)
+            && daten->vIntervalWerte->get(i) == vInterval)
         {
-            daten->vIntervallTexte->remove(i);
-            daten->vIntervallWerte->remove(i);
+            daten->vIntervalTexte->remove(i);
+            daten->vIntervalWerte->remove(i);
             lock->unlock();
             changed = 1;
             return;
@@ -746,7 +746,7 @@ void BaseDiagram::removeVIntervallText(
     lock->unlock();
 }
 
-void BaseDiagram::addWertZ(DiagramValue* w) // Adds a value
+void BaseDiagram::addValueZ(DiagramValue* w) // Adds a value
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
@@ -756,32 +756,32 @@ void BaseDiagram::addWertZ(DiagramValue* w) // Adds a value
     changed = 1;
 }
 
-void BaseDiagram::addWert(DiagramValue* w)
+void BaseDiagram::addValue(DiagramValue* w)
 {
     lock->lock();
     DiagramValue* tmp = new DiagramValue();
     tmp->style = w->style;
-    tmp->farbe = w->farbe;
-    tmp->hintergrund = w->hintergrund;
+    tmp->color = w->color;
+    tmp->background = w->background;
     tmp->name->setText(*w->name);
     int anz = w->punkte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (w->punkte->hat(i))
+        if (w->punkte->has(i))
         {
             DiagramPoint* p = new DiagramPoint();
-            p->hIntervall = w->punkte->get(i)->hIntervall;
-            p->vIntervall = w->punkte->get(i)->vIntervall;
+            p->hInterval = w->punkte->get(i)->hInterval;
+            p->vInterval = w->punkte->get(i)->vInterval;
             tmp->punkte->set(p, i);
         }
     }
     w->release();
-    addWertZ(tmp);
+    addValueZ(tmp);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiagram::addWert(const char* name)
+void BaseDiagram::addValue(const char* name)
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
@@ -793,31 +793,31 @@ void BaseDiagram::addWert(const char* name)
     changed = 1;
 }
 
-void BaseDiagram::addWert(Text* txt)
+void BaseDiagram::addValue(Text* txt)
 {
-    addWert(*txt);
+    addValue(*txt);
     txt->release();
 }
 
-void BaseDiagram::setWertFarbe(int wNum, int f) // sets the color of a value
+void BaseDiagram::setValueColor(int wNum, int f) // sets the color of a value
 {
     if (wNum < 0) return;
     lock->lock();
     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;
+    daten->werte->z(wNum)->color = f;
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiagram::addPunktZ(int wNum, DiagramPoint* p) // adds a point to a value
+void BaseDiagram::addPointZ(int wNum, DiagramPoint* p) // adds a point to a value
 {
     if (wNum < 0) return;
     lock->lock();
     if (!daten) daten = new DiagramData();
     if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
-    while (!daten->werte->hat(wNum))
+    while (!daten->werte->has(wNum))
         daten->werte->add(new DiagramValue());
     if (!daten->werte->z(wNum)->punkte)
         daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
@@ -826,25 +826,25 @@ void BaseDiagram::addPunktZ(int wNum, DiagramPoint* p) // adds a point to a valu
     changed = 1;
 }
 
-void BaseDiagram::addPunkt(int wNum, DiagramPoint* p)
+void BaseDiagram::addPoint(int wNum, DiagramPoint* p)
 {
     if (wNum < 0) return;
     lock->lock();
     if (!daten) daten = new DiagramData();
     if (!daten->werte) daten->werte = new RCArray<DiagramValue>();
-    while (!daten->werte->hat(wNum))
+    while (!daten->werte->has(wNum))
         daten->werte->add(new DiagramValue());
     if (!daten->werte->z(wNum)->punkte)
         daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
     DiagramPoint* tmp = new DiagramPoint();
-    tmp->hIntervall = p->hIntervall;
-    tmp->vIntervall = p->vIntervall;
+    tmp->hInterval = p->hInterval;
+    tmp->vInterval = p->vInterval;
     daten->werte->z(wNum)->punkte->add(tmp);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiagram::addPunkt(int wNum, double hI, double vI)
+void BaseDiagram::addPoint(int wNum, double hI, double vI)
 {
     if (wNum < 0) return;
     lock->lock();
@@ -854,30 +854,30 @@ void BaseDiagram::addPunkt(int wNum, double hI, double vI)
     if (!daten->werte->z(wNum)->punkte)
         daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
     DiagramPoint* tmp = new DiagramPoint();
-    tmp->hIntervall = hI;
-    tmp->vIntervall = vI;
+    tmp->hInterval = hI;
+    tmp->vInterval = vI;
     daten->werte->z(wNum)->punkte->add(tmp);
     lock->unlock();
     changed = 1;
 }
 
 // changes an existing point
-void BaseDiagram::setPunktZ(int wNum, double hI, DiagramPoint* p)
+void BaseDiagram::setPointZ(int wNum, double hI, DiagramPoint* p)
 {
-    setPunktZ(wNum, getDiagramPointPos(wNum, hI), p);
+    setPointZ(wNum, getDiagramPointPos(wNum, hI), p);
 }
 
-void BaseDiagram::setPunkt(int wNum, double hI, DiagramPoint* p)
+void BaseDiagram::setPoint(int wNum, double hI, DiagramPoint* p)
 {
-    setPunkt(wNum, getDiagramPointPos(wNum, hI), p->hIntervall, p->vIntervall);
+    setPoint(wNum, getDiagramPointPos(wNum, hI), p->hInterval, p->vInterval);
 }
 
-void BaseDiagram::setPunkt(int wNum, double hI, double h, double v)
+void BaseDiagram::setPoint(int wNum, double hI, double h, double v)
 {
-    setPunkt(wNum, getDiagramPointPos(wNum, hI), h, v);
+    setPoint(wNum, getDiagramPointPos(wNum, hI), h, v);
 }
 
-void BaseDiagram::setPunktZ(int wNum, int pNum, DiagramPoint* p)
+void BaseDiagram::setPointZ(int wNum, int pNum, DiagramPoint* p)
 {
     if (pNum < 0 || wNum < 0) return;
     lock->lock();
@@ -886,20 +886,20 @@ void BaseDiagram::setPunktZ(int wNum, int pNum, DiagramPoint* p)
     if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (!daten->werte->z(wNum)->punkte)
         daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
-    if (daten->werte->z(wNum)->punkte->hat(pNum))
+    if (daten->werte->z(wNum)->punkte->has(pNum))
         delete daten->werte->z(wNum)->punkte->get(pNum);
     daten->werte->z(wNum)->punkte->set(p, pNum);
     lock->unlock();
     changed = 1;
 }
 
-void BaseDiagram::setPunkt(int wNum, int pNum, DiagramPoint* p)
+void BaseDiagram::setPoint(int wNum, int pNum, DiagramPoint* p)
 {
     if (pNum < 0 || wNum < 0) return;
-    setPunkt(wNum, pNum, p->hIntervall, p->vIntervall);
+    setPoint(wNum, pNum, p->hInterval, p->vInterval);
 }
 
-void BaseDiagram::setPunkt(int wNum, int pNum, double h, double v)
+void BaseDiagram::setPoint(int wNum, int pNum, double h, double v)
 {
     if (pNum < 0 || wNum < 0) return;
     lock->lock();
@@ -908,16 +908,16 @@ void BaseDiagram::setPunkt(int wNum, int pNum, double h, double v)
     if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (!daten->werte->z(wNum)->punkte)
         daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
-    if (!daten->werte->z(wNum)->punkte->hat(pNum))
+    if (!daten->werte->z(wNum)->punkte->has(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;
+    daten->werte->z(wNum)->punkte->get(pNum)->hInterval = h;
+    daten->werte->z(wNum)->punkte->get(pNum)->vInterval = v;
     lock->unlock();
     changed = 1;
 }
 
 // Deletes an existing point
-void BaseDiagram::removePunkt(int wNum, double hI)
+void BaseDiagram::removePoint(int wNum, double hI)
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
@@ -928,8 +928,8 @@ void BaseDiagram::removePunkt(int wNum, double hI)
     int anz = daten->werte->z(wNum)->punkte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (daten->werte->z(wNum)->punkte->hat(i)
-            && daten->werte->z(wNum)->punkte->get(i)->hIntervall == hI)
+        if (daten->werte->z(wNum)->punkte->has(i)
+            && daten->werte->z(wNum)->punkte->get(i)->hInterval == hI)
         {
             delete daten->werte->z(wNum)->punkte->get(i);
             daten->werte->z(wNum)->punkte->remove(i);
@@ -941,7 +941,7 @@ void BaseDiagram::removePunkt(int wNum, double hI)
     lock->unlock();
 }
 
-void BaseDiagram::removePunkt(int wNum, int pNum)
+void BaseDiagram::removePoint(int wNum, int pNum)
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
@@ -949,7 +949,7 @@ void BaseDiagram::removePunkt(int wNum, int pNum)
     if (!daten->werte->z(wNum)) daten->werte->set(new DiagramValue(), wNum);
     if (!daten->werte->z(wNum)->punkte)
         daten->werte->z(wNum)->punkte = new Array<DiagramPoint*>();
-    if (daten->werte->z(wNum)->punkte->hat(pNum))
+    if (daten->werte->z(wNum)->punkte->has(pNum))
     {
         delete daten->werte->z(wNum)->punkte->get(pNum);
         daten->werte->z(wNum)->punkte->remove(pNum);
@@ -958,7 +958,7 @@ void BaseDiagram::removePunkt(int wNum, int pNum)
     lock->unlock();
 }
 
-void BaseDiagram::removeWert(int wNum) // removes a value
+void BaseDiagram::removeValue(int wNum) // removes a value
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
@@ -968,7 +968,7 @@ void BaseDiagram::removeWert(int wNum) // removes a value
     changed = 1;
 }
 
-void BaseDiagram::removeWert(const char* name)
+void BaseDiagram::removeValue(const char* name)
 {
     lock->lock();
     if (!daten) daten = new DiagramData();
@@ -977,7 +977,7 @@ void BaseDiagram::removeWert(const char* name)
     for (int i = 0; i < anz; ++i)
     {
         DiagramValue* tmp = daten->werte->z(i);
-        if (tmp && tmp->name && tmp->name->istGleich(name))
+        if (tmp && tmp->name && tmp->name->isEqual(name))
         {
             daten->werte->remove(i);
             lock->unlock();
@@ -988,42 +988,42 @@ void BaseDiagram::removeWert(const char* name)
     lock->unlock();
 }
 
-void BaseDiagram::removeWert(Text* name)
+void BaseDiagram::removeValue(Text* name)
 {
-    removeWert(name->getText());
+    removeValue(name->getText());
     name->release();
 }
 
-void BaseDiagram::addDatenStyle(int style) // Sets the style of the data
+void BaseDiagram::addDataStyle(int style) // Sets the style of the data
 {
     if (!daten) daten = new DiagramData();
     if ((daten->style | style) != daten->style) changed = 1;
     daten->style |= style;
 }
 
-void BaseDiagram::setDatenStyle(int style)
+void BaseDiagram::setDataStyle(int style)
 {
     if (!daten) daten = new DiagramData();
     if (daten->style != style) changed = 1;
     daten->style = style;
 }
 
-void BaseDiagram::setDatenStyle(int style, bool addRemove)
+void BaseDiagram::setDataStyle(int style, bool addRemove)
 {
     if (addRemove)
-        addDatenStyle(style);
+        addDataStyle(style);
     else
-        removeDatenStyle(style);
+        removeDataStyle(style);
 }
 
-void BaseDiagram::removeDatenStyle(int style)
+void BaseDiagram::removeDataStyle(int style)
 {
     if (!daten) daten = new DiagramData();
     if ((daten->style & ~style) != daten->style) changed = 1;
     daten->style &= ~style;
 }
 
-void BaseDiagram::addWertStyle(int wNum, int style) // Sets the style of a value
+void BaseDiagram::addValueStyle(int wNum, int style) // Sets the style of a value
 {
     if (wNum < 0) return;
     if (!daten) daten = new DiagramData();
@@ -1033,7 +1033,7 @@ void BaseDiagram::addWertStyle(int wNum, int style) // Sets the style of a value
     daten->werte->z(wNum)->style |= style;
 }
 
-void BaseDiagram::setWertStyle(int wNum, int style)
+void BaseDiagram::setValueStyle(int wNum, int style)
 {
     if (wNum < 0) return;
     if (!daten) daten = new DiagramData();
@@ -1042,16 +1042,16 @@ void BaseDiagram::setWertStyle(int wNum, int style)
     daten->werte->z(wNum)->style = style;
 }
 
-void BaseDiagram::setWertStyle(int wNum, int style, bool addRemove)
+void BaseDiagram::setValueStyle(int wNum, int style, bool addRemove)
 {
     if (wNum < 0) return;
     if (addRemove)
-        addWertStyle(wNum, style);
+        addValueStyle(wNum, style);
     else
-        removeWertStyle(wNum, style);
+        removeValueStyle(wNum, style);
 }
 
-void BaseDiagram::removeWertStyle(int wNum, int style)
+void BaseDiagram::removeValueStyle(int wNum, int style)
 {
     if (wNum < 0) return;
     if (!daten) daten = new DiagramData();
@@ -1100,7 +1100,7 @@ int BaseDiagram::getDiagramValuePos(
     for (int i = 0; i < anz; ++i)
     {
         if (daten->werte->z(i) && daten->werte->z(i)->name
-            && daten->werte->z(i)->name->istGleich(name))
+            && daten->werte->z(i)->name->isEqual(name))
             return i;
     }
     return -1;
@@ -1115,8 +1115,8 @@ int BaseDiagram::getDiagramPointPos(int wNum,
     int anz = daten->werte->z(wNum)->punkte->getEntryCount();
     for (int i = 0; i < anz; ++i)
     {
-        if (daten->werte->z(wNum)->punkte->hat(i)
-            && daten->werte->z(wNum)->punkte->get(i)->hIntervall == hI)
+        if (daten->werte->z(wNum)->punkte->has(i)
+            && daten->werte->z(wNum)->punkte->get(i)->hInterval == hI)
             return i;
     }
     return -1;
@@ -1127,19 +1127,19 @@ int BaseDiagram::getDiagramPointPos(char* wName, double hI) const
     return getDiagramPointPos(getDiagramValuePos(wName), hI);
 }
 
-bool BaseDiagram::hatDatenStyle(int style) const // Checks the style of the data
+bool BaseDiagram::hasDataStyle(int style) const // Checks the style of the data
 {
     if (!daten) return 0;
     return (daten->style | style) == daten->style;
 }
 
-bool BaseDiagram::hatDatenStyleNicht(int style) const
+bool BaseDiagram::hasDataStyleNot(int style) const
 {
     if (!daten) return 1;
     return (daten->style | style) != daten->style;
 }
 
-bool BaseDiagram::hatWertStyle(
+bool BaseDiagram::hasValueStyle(
     int wNum, int style) const // Checks the style of a value
 {
     if (!daten || !daten->werte || !daten->werte->z(wNum)) return 0;
@@ -1147,7 +1147,7 @@ bool BaseDiagram::hatWertStyle(
         == daten->werte->z(wNum)->style;
 }
 
-bool BaseDiagram::hatWertStyleNicht(int wNum, int style) const
+bool BaseDiagram::hasValueStyleNot(int wNum, int style) const
 {
     if (!daten || !daten->werte || !daten->werte->z(wNum)) return 1;
     return (daten->werte->z(wNum)->style | style)
@@ -1164,9 +1164,9 @@ BarDiagram::BarDiagram()
       dBgF(0),
       dBgB(0),
       dAf(new AlphaField()),
-      vIntervallRB(new Image()),
-      hIntervallRB(new Image()),
-      schriftGr(12)
+      vIntervalRB(new Image()),
+      hIntervalRB(new Image()),
+      fontGr(12)
 {
     style = Style::MELockDrawable;
     vertikalScrollBar = new VScrollBar();
@@ -1180,32 +1180,32 @@ BarDiagram::~BarDiagram()
     if (dRam) dRam->release();
     if (dBgB) dBgB->release();
     if (dAf) dAf->release();
-    if (vIntervallRB) vIntervallRB->release();
-    if (hIntervallRB) hIntervallRB->release();
+    if (vIntervalRB) vIntervalRB->release();
+    if (hIntervalRB) hIntervalRB->release();
 }
 
 void BarDiagram::doMouseEvent(MouseEvent& me, bool userRet)
 {
-    if (hatDatenStyle(DiagramData::Style::Sichtbar)
-        && (hatStyle(Style::HScroll) || hatStyle(Style::VScroll)) && userRet)
+    if (hasDataStyle(DiagramData::Style::Visible)
+        && (hasStyle(Style::HScroll) || hasStyle(Style::VScroll)) && userRet)
     {
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
-        bool vs = hatStyle(Style::VScroll) && vertikalScrollBar;
-        bool hs = hatStyle(Style::HScroll) && horizontalScrollBar;
+        if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
+        bool vs = hasStyle(Style::VScroll) && vertikalScrollBar;
+        bool hs = hasStyle(Style::HScroll) && horizontalScrollBar;
         if (vs)
         {
             if (hs)
-                horizontalScrollBar->doMausMessage(
+                horizontalScrollBar->doMouseMessage(
                     rbr, gr.y - rbr - 15, gr.x - rbr * 2 - 15, 15, me);
-            vertikalScrollBar->doMausMessage(
+            vertikalScrollBar->doMouseMessage(
                 gr.x - rbr - 15, rbr, 15, gr.y - rbr * 2, me);
         }
         else if (hs)
-            horizontalScrollBar->doMausMessage(
+            horizontalScrollBar->doMouseMessage(
                 rbr, gr.y - rbr - 15, gr.x - rbr * 2, 15, me);
     }
-    me.verarbeitet = userRet;
+    me.processed = userRet;
 }
 
 // non-constant
@@ -1217,22 +1217,22 @@ void BarDiagram::setTextRendererZ(TextRenderer* textRd)
     unlockDrawable();
 }
 
-void BarDiagram::setFontZ(Font* schrift) // Sets the font
+void BarDiagram::setFontZ(Font* font) // Sets the font
 {
     lockDrawable();
     if (!this->textRd)
-        textRd = new TextRenderer(schrift);
+        textRd = new TextRenderer(font);
     else
-        textRd->setFontZ(schrift);
+        textRd->setFontZ(font);
     rend = 1;
     unlockDrawable();
 }
 
-void BarDiagram::setSchriftSize(int gr)
+void BarDiagram::setFontSize(int gr)
 {
     lockDrawable();
-    if (schriftGr != gr) rend = 1;
-    schriftGr = gr;
+    if (fontGr != gr) rend = 1;
+    fontGr = gr;
     unlockDrawable();
 }
 
@@ -1250,40 +1250,40 @@ void BarDiagram::setDataBorder(Border* ram)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
-    dRam->setAlpha(ram->hatAlpha());
-    dRam->setFarbe(ram->getFarbe());
-    dRam->setRamenBreite(ram->getRBreite());
+    dRam->setAlpha(ram->hasAlpha());
+    dRam->setColor(ram->getColor());
+    dRam->setBorderWidth(ram->getRWidth());
     unlockDrawable();
     ram->release();
     rend = 1;
 }
 
-void BarDiagram::setDatenRahmenBreite(int br)
+void BarDiagram::setDataBorderWidth(int br)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
-    if (dRam->getRBreite() != br) rend = 1;
-    dRam->setRamenBreite(br);
+    if (dRam->getRWidth() != br) rend = 1;
+    dRam->setBorderWidth(br);
     unlockDrawable();
 }
 
-void BarDiagram::setDatenRahmenFarbe(int f)
+void BarDiagram::setDataBorderColor(int f)
 {
     lockDrawable();
     if (!dRam) dRam = new LBorder();
-    dRam->setFarbe(f);
+    dRam->setColor(f);
     unlockDrawable();
     rend = 1;
 }
 
-void BarDiagram::setDatenHintergrundFarbe(
+void BarDiagram::setDataBackgroundColor(
     int f) // Sets the background of the actual diagram
 {
     dBgF = f;
     rend = 1;
 }
 
-void BarDiagram::setDatenHintergrundImageZ(Image* b)
+void BarDiagram::setDataBackgroundImageZ(Image* b)
 {
     lockDrawable();
     if (dBgB) dBgB->release();
@@ -1292,12 +1292,12 @@ void BarDiagram::setDatenHintergrundImageZ(Image* b)
     rend = 1;
 }
 
-void BarDiagram::setDatenHintergrundImage(Image* b)
+void BarDiagram::setDataBackgroundImage(Image* b)
 {
     lockDrawable();
     if (!dBgB) dBgB = new Image();
-    dBgB->neuImage(b->getBreite(), b->getHeight(), 0);
-    dBgB->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
+    dBgB->newImage(b->getWidth(), b->getHeight(), 0);
+    dBgB->drawImage(0, 0, b->getWidth(), b->getHeight(), *b);
     unlockDrawable();
     b->release();
     rend = 1;
@@ -1317,23 +1317,23 @@ void BarDiagram::setDataAlphaField(AlphaField* af)
 {
     lockDrawable();
     if (!dAf) dAf = new AlphaField();
-    dAf->setFarbe(af->getFarbe());
+    dAf->setColor(af->getColor());
     dAf->setStrength(af->getStrength());
     unlockDrawable();
     af->release();
     rend = 1;
 }
 
-void BarDiagram::setDatenAlphaFeldFarbe(int f)
+void BarDiagram::setDataAlphaFieldColor(int f)
 {
     lockDrawable();
     if (!dAf) dAf = new AlphaField();
-    dAf->setFarbe(f);
+    dAf->setColor(f);
     unlockDrawable();
     rend = 1;
 }
 
-void BarDiagram::setDatenAlphaFeldStrength(int st)
+void BarDiagram::setDataAlphaFieldStrength(int st)
 {
     lockDrawable();
     if (!dAf) dAf = new AlphaField();
@@ -1344,7 +1344,7 @@ void BarDiagram::setDatenAlphaFeldStrength(int st)
 
 void BarDiagram::render(Image& zRObj)
 {
-    if (!hatDatenStyle(DiagramData::Style::Sichtbar)) return;
+    if (!hasDataStyle(DiagramData::Style::Visible)) return;
     DrawableBackground::render(zRObj);
     if (!zRObj.setDrawOptions(innenPosition, innenSize)) return;
     lockDrawable();
@@ -1355,68 +1355,68 @@ void BarDiagram::render(Image& zRObj)
     int hIAnz = 0;
     if (daten)
     { // calculating auto values
-        vIAnz = daten->vIntervallWerte
-                  ? daten->vIntervallWerte->getEntryCount()
+        vIAnz = daten->vIntervalWerte
+                  ? daten->vIntervalWerte->getEntryCount()
                   : 0;
-        hIAnz = daten->hIntervallWerte
-                  ? daten->hIntervallWerte->getEntryCount()
+        hIAnz = daten->hIntervalWerte
+                  ? daten->hIntervalWerte->getEntryCount()
                   : 0;
-        if (daten->vIntervallWerte
-            && hatDatenStyle(DiagramData::Style::AutoIntervallHeight))
+        if (daten->vIntervalWerte
+            && hasDataStyle(DiagramData::Style::AutoIntervalHeight))
         {
             double maxW = 0;
             for (int i = 0; i < vIAnz; ++i)
             {
-                if (daten->vIntervallWerte->hat(i)
-                    && daten->vIntervallWerte->get(i) > maxW)
-                    maxW = daten->vIntervallWerte->get(i);
+                if (daten->vIntervalWerte->has(i)
+                    && daten->vIntervalWerte->get(i) > maxW)
+                    maxW = daten->vIntervalWerte->get(i);
             }
-            if (vertikalScrollBar && hatStyle(Style::VScroll))
-                daten->vIntervallHeight
+            if (vertikalScrollBar && hasStyle(Style::VScroll))
+                daten->vIntervalHeight
                     = maxW ? (vertikalScrollBar->getScroll() / maxW) : 0;
             else
-                daten->vIntervallHeight
-                    = maxW ? (vIntervallRB->getBreite() / maxW) : 0;
+                daten->vIntervalHeight
+                    = maxW ? (vIntervalRB->getWidth() / maxW) : 0;
         }
-        if (hatDatenStyle(DiagramData::Style::AutoRasterHeight))
-            daten->rasterHeight = daten->vIntervallHeight;
-        if (daten->hIntervallWerte
-            && hatDatenStyle(DiagramData::Style::AutoIntervallBreite))
+        if (hasDataStyle(DiagramData::Style::AutoGridHeight))
+            daten->rasterHeight = daten->vIntervalHeight;
+        if (daten->hIntervalWerte
+            && hasDataStyle(DiagramData::Style::AutoIntervalWidth))
         {
             double maxW = 0;
             for (int i = 0; i < hIAnz; ++i)
             {
-                if (daten->hIntervallWerte->hat(i)
-                    && daten->hIntervallWerte->get(i) > maxW)
-                    maxW = daten->hIntervallWerte->get(i);
+                if (daten->hIntervalWerte->has(i)
+                    && daten->hIntervalWerte->get(i) > maxW)
+                    maxW = daten->hIntervalWerte->get(i);
             }
-            if (horizontalScrollBar && hatStyle(Style::HScroll))
-                daten->hIntervallBreite
+            if (horizontalScrollBar && hasStyle(Style::HScroll))
+                daten->hIntervalWidth
                     = maxW ? (horizontalScrollBar->getScroll() / maxW) : 0;
             else
-                daten->hIntervallBreite
-                    = maxW ? (hIntervallRB->getBreite() / maxW) : 0;
+                daten->hIntervalWidth
+                    = maxW ? (hIntervalRB->getWidth() / maxW) : 0;
         }
-        if (hatDatenStyle(DiagramData::Style::AutoRasterBreite))
-            daten->rasterBreite = daten->hIntervallBreite;
+        if (hasDataStyle(DiagramData::Style::AutoGridWidth))
+            daten->gridWidth = daten->hIntervalWidth;
     }
-    if (hatDatenStyle(DiagramData::Style::VIntervall) && textRd && schriftGr
+    if (hasDataStyle(DiagramData::Style::VInterval) && textRd && fontGr
         && daten)
     { // rendering of the vertical interval
         int vIRBbr = innenSize.y;
-        if (hatDatenStyle(DiagramData::Style::HIntervall)
-            && daten->hIntervallFarbe)
-            vIRBbr -= schriftGr + 2;
+        if (hasDataStyle(DiagramData::Style::HInterval)
+            && daten->hIntervalColor)
+            vIRBbr -= fontGr + 2;
         if (vIRBbr > 0)
         {
-            if (vIntervallRB->getBreite() != vIRBbr
-                || vIntervallRB->getHeight() != schriftGr + 2)
-                vIntervallRB->neuImage(vIRBbr, schriftGr + 2, 0xFF000000);
+            if (vIntervalRB->getWidth() != vIRBbr
+                || vIntervalRB->getHeight() != fontGr + 2)
+                vIntervalRB->newImage(vIRBbr, fontGr + 2, 0xFF000000);
             else
-                vIntervallRB->fillRegion(
-                    0, 0, vIRBbr, schriftGr + 2, 0xFF000000);
-            textRd->setSchriftSize(schriftGr);
-            if (daten->vIntervallWerte)
+                vIntervalRB->fillRegion(
+                    0, 0, vIRBbr, fontGr + 2, 0xFF000000);
+            textRd->setFontSize(fontGr);
+            if (daten->vIntervalWerte)
             {
                 int* rf = new int[vIAnz];
                 int anz = 0;
@@ -1428,11 +1428,11 @@ void BarDiagram::render(Image& zRObj)
                     int mI = -1;
                     for (int j = 0; j < vIAnz; ++j)
                     {
-                        if (!fertig[j] && daten->vIntervallWerte->hat(j)
-                            && (daten->vIntervallWerte->get(j) < min || mI < 0))
+                        if (!fertig[j] && daten->vIntervalWerte->has(j)
+                            && (daten->vIntervalWerte->get(j) < min || mI < 0))
                         {
                             mI = j;
-                            min = daten->vIntervallWerte->get(j);
+                            min = daten->vIntervalWerte->get(j);
                         }
                     }
                     if (mI < 0) break;
@@ -1443,90 +1443,90 @@ void BarDiagram::render(Image& zRObj)
                 delete[] fertig;
                 Text txt;
                 int xPos = 0;
-                if (vertikalScrollBar && hatStyle(Style::VScroll))
+                if (vertikalScrollBar && hasStyle(Style::VScroll))
                     xPos -= vertikalScrollBar->getScroll();
                 int rWeite = xPos - 10;
                 for (int i = anz - 1; i >= 0; --i)
                 {
                     txt = "";
-                    if (hatDatenStyle(DiagramData::Style::VIntervallTexte)
-                        && daten->vIntervallTexte
-                        && daten->vIntervallTexte->z(rf[i]))
-                        txt = daten->vIntervallTexte->z(rf[i])->getText();
-                    else if (hatDatenStyleNicht(
-                                 DiagramData::Style::VIntervallTexte)
-                             || !daten->vIntervallWerte)
-                        txt = daten->vIntervallWerte->get(rf[i]);
-                    xPos = (int)(daten->vIntervallWerte->get(rf[i])
-                                 * daten->vIntervallHeight);
-                    xPos = (vertikalScrollBar && hatStyle(Style::VScroll)
+                    if (hasDataStyle(DiagramData::Style::VIntervalTexte)
+                        && daten->vIntervalTexte
+                        && daten->vIntervalTexte->z(rf[i]))
+                        txt = daten->vIntervalTexte->z(rf[i])->getText();
+                    else if (hasDataStyleNot(
+                                 DiagramData::Style::VIntervalTexte)
+                             || !daten->vIntervalWerte)
+                        txt = daten->vIntervalWerte->get(rf[i]);
+                    xPos = (int)(daten->vIntervalWerte->get(rf[i])
+                                 * daten->vIntervalHeight);
+                    xPos = (vertikalScrollBar && hasStyle(Style::VScroll)
                                    ? vertikalScrollBar->getScroll()
-                                   : vIntervallRB->getBreite())
+                                   : vIntervalRB->getWidth())
                          - xPos;
-                    if (vertikalScrollBar && hatStyle(Style::VScroll))
+                    if (vertikalScrollBar && hasStyle(Style::VScroll))
                         xPos -= vertikalScrollBar->getScroll();
-                    int br = textRd->getTextBreite(txt);
-                    if (xPos + br > vIntervallRB->getBreite()
-                        && vIntervallRB->getBreite() - br >= rWeite + 10)
-                        xPos = vIntervallRB->getBreite() - br;
+                    int br = textRd->getTextWidth(txt);
+                    if (xPos + br > vIntervalRB->getWidth()
+                        && vIntervalRB->getWidth() - br >= rWeite + 10)
+                        xPos = vIntervalRB->getWidth() - br;
                     if (xPos >= rWeite + 10)
                     {
                         textRd->renderText(xPos,
                             1,
                             txt,
-                            *vIntervallRB,
-                            daten->vIntervallFarbe);
+                            *vIntervalRB,
+                            daten->vIntervalColor);
                         rWeite = xPos + br + 10;
                     }
                 }
                 delete[] rf;
             }
-            if (daten->vIntervallName)
+            if (daten->vIntervalName)
             {
                 int vinbr
-                    = textRd->getTextBreite(daten->vIntervallName->getText());
-                int vinx = vIntervallRB->getBreite() / 2 - vinbr / 2;
-                vIntervallRB->fillRegion(
-                    vinx - 5, 1, vinbr + 10, schriftGr, 0xFF000000);
+                    = textRd->getTextWidth(daten->vIntervalName->getText());
+                int vinx = vIntervalRB->getWidth() / 2 - vinbr / 2;
+                vIntervalRB->fillRegion(
+                    vinx - 5, 1, vinbr + 10, fontGr, 0xFF000000);
                 textRd->renderText(vinx,
                     1,
-                    daten->vIntervallName->getText(),
-                    *vIntervallRB,
-                    daten->vIntervallFarbe);
+                    daten->vIntervalName->getText(),
+                    *vIntervalRB,
+                    daten->vIntervalColor);
             }
-            if (hatDatenStyle(DiagramData::Style::HIntervall)
-                && daten->hIntervallFarbe)
-                zRObj.alphaImage90(innenSize.x - vIntervallRB->getHeight(),
-                    schriftGr + 2,
-                    vIntervallRB->getBreite(),
-                    vIntervallRB->getHeight(),
-                    *vIntervallRB);
+            if (hasDataStyle(DiagramData::Style::HInterval)
+                && daten->hIntervalColor)
+                zRObj.alphaImage90(innenSize.x - vIntervalRB->getHeight(),
+                    fontGr + 2,
+                    vIntervalRB->getWidth(),
+                    vIntervalRB->getHeight(),
+                    *vIntervalRB);
             else
-                zRObj.alphaImage90(innenSize.x - vIntervallRB->getHeight(),
+                zRObj.alphaImage90(innenSize.x - vIntervalRB->getHeight(),
                     0,
-                    vIntervallRB->getBreite(),
-                    vIntervallRB->getHeight(),
-                    *vIntervallRB);
-            dgbr -= vIntervallRB->getHeight();
+                    vIntervalRB->getWidth(),
+                    vIntervalRB->getHeight(),
+                    *vIntervalRB);
+            dgbr -= vIntervalRB->getHeight();
         }
     }
-    if (hatDatenStyle(DiagramData::Style::HIntervall) && textRd && schriftGr
+    if (hasDataStyle(DiagramData::Style::HInterval) && textRd && fontGr
         && daten)
     { // rendering of the horizontal interval
         int hIRBbr = innenSize.x;
-        if (hatDatenStyle(DiagramData::Style::VIntervall)
-            && daten->vIntervallFarbe)
-            hIRBbr -= schriftGr + 2;
+        if (hasDataStyle(DiagramData::Style::VInterval)
+            && daten->vIntervalColor)
+            hIRBbr -= fontGr + 2;
         if (hIRBbr > 0)
         {
-            if (hIntervallRB->getBreite() != hIRBbr
-                || hIntervallRB->getHeight() != schriftGr + 2)
-                hIntervallRB->neuImage(hIRBbr, schriftGr + 2, 0xFF000000);
+            if (hIntervalRB->getWidth() != hIRBbr
+                || hIntervalRB->getHeight() != fontGr + 2)
+                hIntervalRB->newImage(hIRBbr, fontGr + 2, 0xFF000000);
             else
-                hIntervallRB->fillRegion(
-                    0, 0, hIRBbr, schriftGr + 2, 0xFF000000);
-            textRd->setSchriftSize(schriftGr);
-            if (daten->hIntervallWerte)
+                hIntervalRB->fillRegion(
+                    0, 0, hIRBbr, fontGr + 2, 0xFF000000);
+            textRd->setFontSize(fontGr);
+            if (daten->hIntervalWerte)
             {
                 int* rf = new int[hIAnz];
                 int anz = 0;
@@ -1538,11 +1538,11 @@ void BarDiagram::render(Image& zRObj)
                     int mI = -1;
                     for (int j = 0; j < hIAnz; ++j)
                     {
-                        if (!fertig[j] && daten->hIntervallWerte->hat(j)
-                            && (daten->hIntervallWerte->get(j) < min || mI < 0))
+                        if (!fertig[j] && daten->hIntervalWerte->has(j)
+                            && (daten->hIntervalWerte->get(j) < min || mI < 0))
                         {
                             mI = j;
-                            min = daten->hIntervallWerte->get(j);
+                            min = daten->hIntervalWerte->get(j);
                         }
                     }
                     if (mI < 0) break;
@@ -1553,60 +1553,60 @@ void BarDiagram::render(Image& zRObj)
                 delete[] fertig;
                 Text txt;
                 int xPos = 0;
-                if (horizontalScrollBar && hatStyle(Style::HScroll))
+                if (horizontalScrollBar && hasStyle(Style::HScroll))
                     xPos -= horizontalScrollBar->getScroll();
                 int rWeite = xPos - 10;
                 for (int i = 0; i < anz; ++i)
                 {
                     txt = "";
-                    if (hatDatenStyle(DiagramData::Style::HIntervallTexte)
-                        && daten->hIntervallTexte
-                        && daten->hIntervallTexte->z(rf[i]))
-                        txt = daten->hIntervallTexte->z(rf[i])->getText();
-                    else if (hatDatenStyleNicht(
-                                 DiagramData::Style::HIntervallTexte)
-                             || !daten->hIntervallWerte)
-                        txt = daten->hIntervallWerte->get(rf[i]);
-                    xPos = (int)(daten->hIntervallWerte->get(rf[i])
-                                 * daten->hIntervallBreite);
-                    if (horizontalScrollBar && hatStyle(Style::HScroll))
+                    if (hasDataStyle(DiagramData::Style::HIntervalTexte)
+                        && daten->hIntervalTexte
+                        && daten->hIntervalTexte->z(rf[i]))
+                        txt = daten->hIntervalTexte->z(rf[i])->getText();
+                    else if (hasDataStyleNot(
+                                 DiagramData::Style::HIntervalTexte)
+                             || !daten->hIntervalWerte)
+                        txt = daten->hIntervalWerte->get(rf[i]);
+                    xPos = (int)(daten->hIntervalWerte->get(rf[i])
+                                 * daten->hIntervalWidth);
+                    if (horizontalScrollBar && hasStyle(Style::HScroll))
                         xPos -= horizontalScrollBar->getScroll();
-                    int br = textRd->getTextBreite(txt);
-                    if (xPos + br > hIntervallRB->getBreite()
-                        && hIntervallRB->getBreite() - br >= rWeite + 10)
-                        xPos = hIntervallRB->getBreite() - br;
+                    int br = textRd->getTextWidth(txt);
+                    if (xPos + br > hIntervalRB->getWidth()
+                        && hIntervalRB->getWidth() - br >= rWeite + 10)
+                        xPos = hIntervalRB->getWidth() - br;
                     if (xPos >= rWeite + 10)
                     {
                         textRd->renderText(xPos,
                             1,
                             txt,
-                            *hIntervallRB,
-                            daten->hIntervallFarbe);
+                            *hIntervalRB,
+                            daten->hIntervalColor);
                         rWeite = xPos + br + 10;
                     }
                 }
                 delete[] rf;
             }
-            if (daten->hIntervallName)
+            if (daten->hIntervalName)
             {
                 int hinbr
-                    = textRd->getTextBreite(daten->hIntervallName->getText());
-                int hinx = hIntervallRB->getBreite() / 2 - hinbr / 2;
-                hIntervallRB->fillRegion(
-                    hinx - 5, 1, hinbr + 10, schriftGr, 0xFF000000);
+                    = textRd->getTextWidth(daten->hIntervalName->getText());
+                int hinx = hIntervalRB->getWidth() / 2 - hinbr / 2;
+                hIntervalRB->fillRegion(
+                    hinx - 5, 1, hinbr + 10, fontGr, 0xFF000000);
                 textRd->renderText(hinx,
                     1,
-                    daten->hIntervallName->getText(),
-                    *hIntervallRB,
-                    daten->hIntervallFarbe);
+                    daten->hIntervalName->getText(),
+                    *hIntervalRB,
+                    daten->hIntervalColor);
             }
             zRObj.alphaImage(0,
                 0,
-                hIntervallRB->getBreite(),
-                hIntervallRB->getHeight(),
-                *hIntervallRB);
-            dghi -= hIntervallRB->getHeight();
-            dgy += hIntervallRB->getHeight();
+                hIntervalRB->getWidth(),
+                hIntervalRB->getHeight(),
+                *hIntervalRB);
+            dghi -= hIntervalRB->getHeight();
+            dgy += hIntervalRB->getHeight();
         }
     }
     if (!zRObj.setDrawOptions(0, dgy, dgbr, dghi))
@@ -1617,11 +1617,11 @@ void BarDiagram::render(Image& zRObj)
     }
     dgy = 0;
     int dgrbr = 0;
-    if (hatStyle(Style::DatenRahmen) && dRam)
+    if (hasStyle(Style::DataBorder) && dRam)
     {
         dRam->setSize(dgbr, dghi);
         dRam->render(zRObj);
-        dgrbr = dRam->getRBreite();
+        dgrbr = dRam->getRWidth();
     }
     if (!zRObj.setDrawOptions(dgrbr, dgrbr, dgbr - dgrbr * 2, dghi - dgrbr * 2))
     {
@@ -1630,80 +1630,80 @@ void BarDiagram::render(Image& zRObj)
         unlockDrawable();
         return;
     }
-    if (hatStyle(Style::DatenHintergrund))
+    if (hasStyle(Style::DataBackground))
     {
-        if (hatStyle(Style::DatenHAlpha))
+        if (hasStyle(Style::DataHAlpha))
             zRObj.alphaRegion(0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, dBgF);
         else
             zRObj.fillRegion(0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, dBgF);
-        if (hatStyle(Style::DatenHImage) && dBgB)
+        if (hasStyle(Style::DataHImage) && dBgB)
         {
-            if (hatStyle(Style::DatenHAlpha))
+            if (hasStyle(Style::DataHAlpha))
                 zRObj.alphaImage(
                     0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, *dBgB);
             else
                 zRObj.drawImage(0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, *dBgB);
         }
     }
-    if (hatStyle(Style::DatenBuffered) && dAf)
+    if (hasStyle(Style::DataBuffered) && dAf)
     {
         dAf->setSize(dgbr - dgrbr * 2, dghi - dgrbr * 2);
         dAf->render(zRObj);
     }
-    if (hatDatenStyle(DiagramData::Style::Raster) && daten && daten->rasterDicke
-        && daten->rasterBreite && daten->rasterHeight)
+    if (hasDataStyle(DiagramData::Style::Raster) && daten && daten->rasterDicke
+        && daten->gridWidth && daten->rasterHeight)
     { // Raster
         int maxBr = dgbr;
-        if (horizontalScrollBar && hatStyle(Style::HScroll))
+        if (horizontalScrollBar && hasStyle(Style::HScroll))
             maxBr = horizontalScrollBar->getScroll();
         int maxHi = dghi;
-        if (vertikalScrollBar && hatStyle(Style::VScroll))
+        if (vertikalScrollBar && hasStyle(Style::VScroll))
             maxHi = vertikalScrollBar->getScroll();
-        for (double x = horizontalScrollBar && hatStyle(Style::HScroll)
+        for (double x = horizontalScrollBar && hasStyle(Style::HScroll)
                           ? -horizontalScrollBar->getScroll()
                           : 0;
             x < maxBr;
-            x += daten->rasterBreite)
+            x += daten->gridWidth)
         {
             for (int i = 0; i < daten->rasterDicke; ++i)
             {
-                if (hatDatenStyle(DiagramData::Style::RasterAlpha))
-                    zRObj.drawLinieVAlpha((int)(x + i),
+                if (hasDataStyle(DiagramData::Style::RasterAlpha))
+                    zRObj.drawLineVAlpha((int)(x + i),
                         dgy + dgrbr,
                         dghi - dgrbr * 2,
-                        daten->rasterFarbe);
+                        daten->rasterColor);
                 else
-                    zRObj.drawLinieV((int)(x + i),
+                    zRObj.drawLineV((int)(x + i),
                         dgy + dgrbr,
                         dghi - dgrbr * 2,
-                        daten->rasterFarbe);
+                        daten->rasterColor);
             }
         }
         for (double y = maxHi;
-            y > (vertikalScrollBar && hatStyle(Style::VScroll)
+            y > (vertikalScrollBar && hasStyle(Style::VScroll)
                      ? -vertikalScrollBar->getScroll()
                      : 0);
             y -= daten->rasterHeight)
         {
             for (int i = 0; i < daten->rasterDicke; ++i)
             {
-                if (hatDatenStyle(DiagramData::Style::RasterAlpha))
-                    zRObj.drawLinieHAlpha(
-                        0, (int)(y + i), dgbr - dgrbr * 2, daten->rasterFarbe);
+                if (hasDataStyle(DiagramData::Style::RasterAlpha))
+                    zRObj.drawLineHAlpha(
+                        0, (int)(y + i), dgbr - dgrbr * 2, daten->rasterColor);
                 else
-                    zRObj.drawLinieH(
-                        0, (int)(y + i), dgbr - dgrbr * 2, daten->rasterFarbe);
+                    zRObj.drawLineH(
+                        0, (int)(y + i), dgbr - dgrbr * 2, daten->rasterColor);
             }
         }
     }
     if (daten && daten->werte && daten->werte->getEntryCount()
-        && daten->hIntervallBreite && daten->vIntervallHeight)
+        && daten->hIntervalWidth && daten->vIntervalHeight)
     { // values
         int wAnz = daten->werte->getEntryCount();
         for (int i = 0; i < wAnz; ++i)
         {
             DiagramValue* wert = daten->werte->z(i);
-            if (wert && hatWertStyle(i, DiagramValue::Style::Sichtbar)
+            if (wert && hasValueStyle(i, DiagramValue::Style::Visible)
                 && wert->punkte && wert->punkte->getEntryCount())
             {
                 int pAnz = wert->punkte->getEntryCount();
@@ -1717,11 +1717,11 @@ void BarDiagram::render(Image& zRObj)
                     int p = -1;
                     for (int pi = 0; pi < pAnz; ++pi)
                     {
-                        if (wert->punkte->hat(pi) && !fertig[pi]
+                        if (wert->punkte->has(pi) && !fertig[pi]
                             && (p < 0
-                                || wert->punkte->get(pi)->hIntervall < min))
+                                || wert->punkte->get(pi)->hInterval < min))
                         {
-                            min = wert->punkte->get(pi)->hIntervall;
+                            min = wert->punkte->get(pi)->hInterval;
                             p = pi;
                         }
                     }
@@ -1731,18 +1731,18 @@ void BarDiagram::render(Image& zRObj)
                     ++anz;
                 }
                 delete[] fertig;
-                int rpx = horizontalScrollBar && hatStyle(Style::HScroll)
+                int rpx = horizontalScrollBar && hasStyle(Style::HScroll)
                             ? -horizontalScrollBar->getScroll()
                             : 0;
-                int rpy = vertikalScrollBar && hatStyle(Style::VScroll)
+                int rpy = vertikalScrollBar && hasStyle(Style::VScroll)
                             ? -vertikalScrollBar->getScroll()
                             : 0;
                 rpy += dgy;
                 int dgmhi
-                    = vertikalScrollBar && hatStyle(Style::VScroll)
+                    = vertikalScrollBar && hasStyle(Style::VScroll)
                         ? dgy + vertikalScrollBar->getScrollData()->max + dgrbr
                         : dgy + dghi - dgrbr;
-                if (hatWertStyle(i, DiagramValue::Style::Hintergrund))
+                if (hasValueStyle(i, DiagramValue::Style::Background))
                 {
                     DiagramPoint* vorher = 0;
                     DiagramPoint* jetzt = 0;
@@ -1752,17 +1752,17 @@ void BarDiagram::render(Image& zRObj)
                         if (jetzt && vorher)
                         {
                             int ax = (int)(rpx
-                                           + vorher->hIntervall
-                                                 * daten->hIntervallBreite);
+                                           + vorher->hInterval
+                                                 * daten->hIntervalWidth);
                             int ay = (int)(dgmhi
-                                           - vorher->vIntervall
-                                                 * daten->vIntervallHeight);
+                                           - vorher->vInterval
+                                                 * daten->vIntervalHeight);
                             int bx = (int)(rpx
-                                           + jetzt->hIntervall
-                                                 * daten->hIntervallBreite);
+                                           + jetzt->hInterval
+                                                 * daten->hIntervalWidth);
                             int by = (int)(dgmhi
-                                           - jetzt->vIntervall
-                                                 * daten->vIntervallHeight);
+                                           - jetzt->vInterval
+                                                 * daten->vIntervalHeight);
                             if (ax >= bx)
                             {
                                 vorher = jetzt;
@@ -1776,30 +1776,30 @@ void BarDiagram::render(Image& zRObj)
                                 double y = (double)ay;
                                 ax = ax < 0 ? 0 : ax;
                                 bx = bx > dgbr - dgrbr ? dgbr - dgrbr : bx;
-                                if (hatWertStyle(i, DiagramValue::Style::HAlpha))
+                                if (hasValueStyle(i, DiagramValue::Style::HAlpha))
                                 {
                                     for (int x = ax; x < bx; x++, y += yf)
-                                        zRObj.drawLinieVAlpha(x,
+                                        zRObj.drawLineVAlpha(x,
                                             (int)(y + 0.5),
                                             dgmhi - (int)(y + 0.5),
-                                            wert->hintergrund);
+                                            wert->background);
                                 }
                                 else
                                 {
                                     for (int x = ax; x < bx; x++, y += yf)
-                                        zRObj.drawLinieV(x,
+                                        zRObj.drawLineV(x,
                                             (int)(y + 0.5),
                                             dgmhi - (int)(y + 0.5),
-                                            wert->hintergrund);
+                                            wert->background);
                                 }
-                                if (hatWertStyle(i, DiagramValue::Style::Alpha))
-                                    zRObj.drawLinieAlpha(Punkt(ax, ay),
-                                        Punkt(bx, by),
-                                        wert->farbe);
+                                if (hasValueStyle(i, DiagramValue::Style::Alpha))
+                                    zRObj.drawLineAlpha(Point(ax, ay),
+                                        Point(bx, by),
+                                        wert->color);
                                 else
-                                    zRObj.drawLinie(Punkt(ax, ay),
-                                        Punkt(bx, by),
-                                        wert->farbe);
+                                    zRObj.drawLine(Point(ax, ay),
+                                        Point(bx, by),
+                                        wert->color);
                             }
                         }
                         vorher = jetzt;
@@ -1814,40 +1814,40 @@ void BarDiagram::render(Image& zRObj)
                         jetzt = wert->punkte->get(rf[j]);
                         if (jetzt && vorher)
                         {
-                            if (hatWertStyle(i, DiagramValue::Style::Alpha))
-                                zRObj.drawLinieAlpha(
-                                    Punkt(
+                            if (hasValueStyle(i, DiagramValue::Style::Alpha))
+                                zRObj.drawLineAlpha(
+                                    Point(
                                         (int)(rpx
-                                              + vorher->hIntervall
-                                                    * daten->hIntervallBreite),
+                                              + vorher->hInterval
+                                                    * daten->hIntervalWidth),
                                         (int)(dgmhi
-                                              - vorher->vIntervall
-                                                    * daten->vIntervallHeight)),
-                                    Punkt(
+                                              - vorher->vInterval
+                                                    * daten->vIntervalHeight)),
+                                    Point(
                                         (int)(rpx
-                                              + jetzt->hIntervall
-                                                    * daten->hIntervallBreite),
+                                              + jetzt->hInterval
+                                                    * daten->hIntervalWidth),
                                         (int)(dgmhi
-                                              - jetzt->vIntervall
-                                                    * daten->vIntervallHeight)),
-                                    wert->farbe);
+                                              - jetzt->vInterval
+                                                    * daten->vIntervalHeight)),
+                                    wert->color);
                             else
-                                zRObj.drawLinie(
-                                    Punkt(
+                                zRObj.drawLine(
+                                    Point(
                                         (int)(rpx
-                                              + vorher->hIntervall
-                                                    * daten->hIntervallBreite),
+                                              + vorher->hInterval
+                                                    * daten->hIntervalWidth),
                                         (int)(dgmhi
-                                              - vorher->vIntervall
-                                                    * daten->vIntervallHeight)),
-                                    Punkt(
+                                              - vorher->vInterval
+                                                    * daten->vIntervalHeight)),
+                                    Point(
                                         (int)(rpx
-                                              + jetzt->hIntervall
-                                                    * daten->hIntervallBreite),
+                                              + jetzt->hInterval
+                                                    * daten->hIntervalWidth),
                                         (int)(dgmhi
-                                              - jetzt->vIntervall
-                                                    * daten->vIntervallHeight)),
-                                    wert->farbe);
+                                              - jetzt->vInterval
+                                                    * daten->vIntervalHeight)),
+                                    wert->color);
                         }
                         vorher = jetzt;
                     }
@@ -1857,21 +1857,21 @@ void BarDiagram::render(Image& zRObj)
         }
     }
     if (daten && daten->werte && daten->werte->getEntryCount() && textRd
-        && schriftGr)
+        && fontGr)
     {
         int wAnz = daten->werte->getEntryCount();
         int rx = 5;
         int ry = 5;
-        textRd->setSchriftSize(schriftGr);
+        textRd->setFontSize(fontGr);
         for (int i = 0; i < wAnz; ++i)
         {
             DiagramValue* w = daten->werte->z(i);
-            if (w && w->name && hatWertStyle(i, DiagramValue::Style::Name)
-                && hatWertStyle(i, DiagramValue::Style::Sichtbar))
+            if (w && w->name && hasValueStyle(i, DiagramValue::Style::Name)
+                && hasValueStyle(i, DiagramValue::Style::Visible))
             {
-                int br = textRd->getTextBreite(w->name->getText());
-                zRObj.alphaRegion(rx, ry, br, schriftGr, 0xA0000000);
-                textRd->renderText(rx, ry, w->name->getText(), zRObj, w->farbe);
+                int br = textRd->getTextWidth(w->name->getText());
+                zRObj.alphaRegion(rx, ry, br, fontGr, 0xA0000000);
+                textRd->renderText(rx, ry, w->name->getText(), zRObj, w->color);
                 ry += 15;
             }
         }
@@ -1904,28 +1904,28 @@ Border* BarDiagram::zDataBorder() const
     return dRam;
 }
 
-int BarDiagram::getDatenRahmenFarbe() const
+int BarDiagram::getDataBorderColor() const
 {
-    return dRam ? dRam->getFarbe() : 0;
+    return dRam ? dRam->getColor() : 0;
 }
 
-int BarDiagram::getDatenRahmenBreite() const
+int BarDiagram::getDataBorderWidth() const
 {
-    return dRam ? dRam->getRBreite() : 0;
+    return dRam ? dRam->getRWidth() : 0;
 }
 
-int BarDiagram::getDatenHintergrundFarbe()
+int BarDiagram::getDataBackgroundColor()
     const // Returns the background of the actual diagram
 {
     return dBgF;
 }
 
-Image* BarDiagram::getDatenHintergrundImage() const
+Image* BarDiagram::getDataBackgroundImage() const
 {
     return dBgB ? dynamic_cast<Image*>(dBgB->getThis()) : 0;
 }
 
-Image* BarDiagram::zDatenHintergrundImage() const
+Image* BarDiagram::zDataBackgroundImage() const
 {
     return dBgB;
 }
@@ -1941,12 +1941,12 @@ AlphaField* BarDiagram::zDataAlphaField() const
     return dAf;
 }
 
-int BarDiagram::getDatenAlphaFeldFarbe() const
+int BarDiagram::getDataAlphaFieldColor() const
 {
-    return dAf ? dAf->getFarbe() : 0;
+    return dAf ? dAf->getColor() : 0;
 }
 
-int BarDiagram::getDatenAlphaFeldStrength() const
+int BarDiagram::getDataAlphaFieldStrength() const
 {
     return dAf ? dAf->getStrength() : 0;
 }

Diagram.h

@@ -27,23 +27,23 @@ namespace Framework
             //! A grid is drawn in the diagram for orientation
             static const __int64 Gitter = 0x01000;
             //! The names of the graphs are displayed
-            static const __int64 LinienName = 0x02000;
+            static const __int64 LineName = 0x02000;
 
             //! Combination of flags Visible, Background,
             //! Border, Grid, LineName
             static const __int64 normal
-                = Sichtbar | Hintergrund | Border | Gitter | LinienName;
+                = Visible | Background | Border | Gitter | LineName;
         };
 
     private:
         int gF;
-        Array<int>* lFarbe;
+        Array<int>* lColor;
         RCArray<Text>* lName;
         RCArray<Array<int>>* ph;
         RCArray<Array<int>>* pb;
         Array<int>* lastValue;
         TextRenderer* textRd;
-        Punkt gitterGr;
+        Point gitterGr;
         int lines;
 
     public:
@@ -55,37 +55,37 @@ namespace Framework
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets a pointer to the used font
-        //! \param schrift The font
-        DLLEXPORT void setFontZ(Font* schrift);
+        //! \param font The font
+        DLLEXPORT void setFontZ(Font* font);
         //! Sets the spacing between the grid lines
         //! \param gr For x the spacing between each vertical line in
         //! pixels and for y the spacing between each horizontal line in
         //! the displayed y values
-        DLLEXPORT void setGSize(Punkt& gr);
+        DLLEXPORT void setGSize(Point& gr);
         //! Sets the color of the grid lines
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setGFarbe(int f);
+        DLLEXPORT void setGColor(int f);
         //! Adds a new graph to the diagram
         //! \param name The name of the graph. It is displayed in the diagram
         //! when the LineName flag is set
-        DLLEXPORT void addLinie(const char* name);
+        DLLEXPORT void addLine(const char* name);
         //! Adds a new graph to the diagram
         //! \param name The name of the graph. It is displayed in the diagram
         //! when the LineName flag is set
-        DLLEXPORT void addLinie(Text* txt);
+        DLLEXPORT void addLine(Text* txt);
         //! Sets the color of a graph
         //! \param lNum The index of the graph
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setLFarbe(int lNum, int f);
+        DLLEXPORT void setLColor(int lNum, int f);
         //! Adds a point to a graph. This shifts all points of the graph
         //! to the left so that the new point appears on the right. If a point
         //! goes off the left edge of the diagram, it is deleted. This way the
         //! diagram appears like a live measurement \param x The distance to the
         //! last point in pixels \param y The value of the displayed function at the point
-        DLLEXPORT void addPunkt(int lNum, int x, int h);
+        DLLEXPORT void addPoint(int lNum, int x, int h);
         //! Removes a graph
         //! \param lNum The index of the graph
-        DLLEXPORT void removeLinie(int lNum);
+        DLLEXPORT void removeLine(int lNum);
         //! Draws the diagram
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
@@ -95,21 +95,21 @@ namespace Framework
         DLLEXPORT Font* zFont() const;
         //! Returns the size of a grid square, where the width is in pixels
         //! and the height is in y axis values
-        DLLEXPORT const Punkt& getGSize() const;
+        DLLEXPORT const Point& getGSize() const;
         //! Returns the color of the grid in A8R8G8B8 format
-        DLLEXPORT int getGFarbe() const;
+        DLLEXPORT int getGColor() const;
         //! Returns the index of a graph
         //! \param name The name of the graph
-        DLLEXPORT int getLinienNummer(const char* name) const;
+        DLLEXPORT int getLineNumber(const char* name) const;
         //! Returns the index of a graph
         //! \param name The name of the graph
-        DLLEXPORT int getLinienNummer(Text* name) const;
+        DLLEXPORT int getLineNumber(Text* name) const;
         //! Returns the name of a graph
         //! \param lNum The index of the graph
-        DLLEXPORT Text* getLinienName(int lNum) const;
+        DLLEXPORT Text* getLineName(int lNum) const;
         //! Returns the name of a graph without increased reference counter
         //! \param lNum The index of the graph
-        DLLEXPORT Text* zLinienNamen(int lNum) const;
+        DLLEXPORT Text* zLineNames(int lNum) const;
         //! Returns the highest y value of all graphs
         DLLEXPORT int getHighestValue() const;
         //! Returns the highest y value of a specific graph
@@ -119,7 +119,7 @@ namespace Framework
         //! for a graph \param lNum The index of the graph
         DLLEXPORT int getMedian(int lNum) const;
         //! Returns the number of graphs
-        DLLEXPORT int getLAnzahl() const;
+        DLLEXPORT int getLCount() const;
         //! Returns the y value of the last point of a graph
         //! \param lNum The index of the graph
         DLLEXPORT int getLastValue(int lNum) const;
@@ -129,9 +129,9 @@ namespace Framework
     struct DiagramPoint
     {
         //! Position of the point on the horizontal interval of the diagram
-        double hIntervall;
+        double hInterval;
         //! Position of the point on the vertical interval of the diagram
-        double vIntervall;
+        double vInterval;
     };
 
     //! Value that is visualized in a diagram
@@ -141,12 +141,12 @@ namespace Framework
         class Style
         {
         public:
-            static const int Sichtbar
+            static const int Visible
                 = 0x01; //! Determines whether the value should be displayed
             static const int Alpha
                 = 0x02; //! Determines whether alpha blending should be used
                         //! when drawing the value
-            static const int Hintergrund
+            static const int Background
                 = 0x04; //! Determines whether the value has a background
             static const int HAlpha
                 = 0x08; //! Determines whether alpha blending should be used
@@ -158,9 +158,9 @@ namespace Framework
         //! Style of the value
         int style;
         //! Color of the value
-        int farbe;
+        int color;
         //! Background color of the value
-        int hintergrund;
+        int background;
         //! Name of the value
         Text* name;
         //! Points of the value
@@ -178,7 +178,7 @@ namespace Framework
         class Style
         {
         public:
-            static const int Sichtbar
+            static const int Visible
                 = 0x0001; //! Determines whether the data should be visible
             static const int Raster
                 = 0x0002; //! Determines whether a grid for orientation
@@ -186,46 +186,46 @@ namespace Framework
             static const int RasterAlpha
                 = 0x0004; //! Determines whether alpha blending should be used
                           //! for drawing the grid
-            static const int AutoIntervallHeight
+            static const int AutoIntervalHeight
                 = 0x0008; //! Determines that all values are automatically scaled
                           //! on the y axis so that the full height of the
                           //! diagram is always used
-            static const int AutoIntervallBreite
+            static const int AutoIntervalWidth
                 = 0x0010; //! Determines that all values are automatically scaled
                           //! on the x axis so that the full width of the
                           //! diagram is always used
-            static const int HIntervall
+            static const int HInterval
                 = 0x0020; //! Determines whether the X axis should be drawn
-            static const int VIntervall
+            static const int VInterval
                 = 0x0040; //! Determines whether the Y axis should be drawn
-            static const int HIntervallTexte
+            static const int HIntervalTexte
                 = 0x0200; //! Determines whether custom texts for the X axis
                           //! values should be drawn
-            static const int VIntervallTexte
+            static const int VIntervalTexte
                 = 0x0400; //! Determines whether custom texts for the Y axis
                           //! values should be drawn
-            static const int AutoRasterBreite
+            static const int AutoGridWidth
                 = 0x0800; //! Determines whether the spacing between vertical
                           //! grid lines should be chosen automatically
-            static const int AutoRasterHeight
+            static const int AutoGridHeight
                 = 0x1000; //! Determines whether the spacing between horizontal
                           //! grid lines should be chosen automatically
 
-            static const int intervalle
-                = HIntervall
-                | VIntervall; //! Combines flags HIntervall, VIntervall
-            static const int intervallTexte
-                = HIntervallTexte
-                | VIntervallTexte; //! Combines flags HIntervallTexte,
-                                   //! VIntervallTexte
-            static const int autoRaster
-                = AutoRasterHeight | AutoRasterBreite
-                | Raster; //! Combines flags AutoRasterHeight,
-                          //! AutoRasterBreite, Raster
-            static const int autoIntervall
-                = AutoIntervallHeight
-                | AutoIntervallBreite; //! Combines flags AutoIntervallHeight,
-                                       //! AutoIntervallBreite
+            static const int intervale
+                = HInterval
+                | VInterval; //! Combines flags HInterval, VInterval
+            static const int intervalTexte
+                = HIntervalTexte
+                | VIntervalTexte; //! Combines flags HIntervalTexte,
+                                   //! VIntervalTexte
+            static const int autoGrid
+                = AutoGridHeight | AutoGridWidth
+                | Raster; //! Combines flags AutoGridHeight,
+                          //! AutoGridWidth, Raster
+            static const int autoInterval
+                = AutoIntervalHeight
+                | AutoIntervalWidth; //! Combines flags AutoIntervalHeight,
+                                       //! AutoIntervalWidth
         };
 
         //! Style of the diagram
@@ -233,33 +233,33 @@ namespace Framework
         //! Width of a grid line
         int rasterDicke;
         //! Width of a grid cell
-        double rasterBreite;
+        double gridWidth;
         //! Height of a grid cell
         double rasterHeight;
         //! Color of the grid
-        int rasterFarbe;
+        int rasterColor;
         //! Font color of the horizontal interval
-        int hIntervallFarbe;
+        int hIntervalColor;
         //! Font color of the vertical interval
-        int vIntervallFarbe;
+        int vIntervalColor;
         //! Name of the horizontal interval
-        Text* hIntervallName;
+        Text* hIntervalName;
         //! Name of the vertical interval
-        Text* vIntervallName;
+        Text* vIntervalName;
         //! Labels of the horizontal interval
-        RCArray<Text>* hIntervallTexte;
+        RCArray<Text>* hIntervalTexte;
         //! Labels of the vertical interval
-        RCArray<Text>* vIntervallTexte;
+        RCArray<Text>* vIntervalTexte;
         //! Individual horizontal intervals
-        Array<double>* hIntervallWerte;
+        Array<double>* hIntervalWerte;
         //! Individual vertical intervals
-        Array<double>* vIntervallWerte;
+        Array<double>* vIntervalWerte;
         //! Width of value 1 in pixels for the horizontal interval (overridden
-        //! by setting AutoIntervallBreite)
-        double hIntervallBreite;
+        //! by setting AutoIntervalWidth)
+        double hIntervalWidth;
         //! Height of value 1 in pixels for the vertical interval (overridden
-        //! by setting AutoIntervallHeight)
-        double vIntervallHeight;
+        //! by setting AutoIntervalHeight)
+        double vIntervalHeight;
         //! Values visualized in the diagram
         RCArray<DiagramValue>* werte;
 
@@ -292,198 +292,198 @@ namespace Framework
         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);
+        DLLEXPORT void setGridThickness(int d);
         //! Sets the grid width
         //! \param br The spacing between two vertical grid lines in pixels
-        DLLEXPORT void setRasterBreite(int br);
+        DLLEXPORT void setGridWidth(int br);
         //! Sets the grid height
         //! \param hi The spacing between two horizontal grid lines in pixels
-        DLLEXPORT void setRasterHeight(int hi);
+        DLLEXPORT void setGridHeight(int hi);
         //! Sets the grid color
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setRasterFarbe(int f);
+        DLLEXPORT void setGridColor(int f);
         //! Sets the interval width
         //! \param br The distance between values 0 and 1 on the X axis in pixels
-        DLLEXPORT void setHIntervallBreite(double br);
+        DLLEXPORT void setHIntervalWidth(double br);
         //! Sets the interval height
         //! \param hi The distance between values 0 and 1 on the Y axis in pixels
-        DLLEXPORT void setVIntervallHeight(double hi);
+        DLLEXPORT void setVIntervalHeight(double hi);
         //! Sets the color of the X axis
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setHIntervallFarbe(int f);
+        DLLEXPORT void setHIntervalColor(int f);
         //! Sets the color of the Y axis
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setVIntervallFarbe(int f);
+        DLLEXPORT void setVIntervalColor(int f);
         //! Sets the name of the X axis
         //! \param name The name
-        DLLEXPORT void setHIntervallName(const char* name);
+        DLLEXPORT void setHIntervalName(const char* name);
         //! Sets the name of the X axis
         //! \param name The name
-        DLLEXPORT void setHIntervallName(Text* name);
+        DLLEXPORT void setHIntervalName(Text* name);
         //! Sets the name of the Y axis
         //! \param name The name
-        DLLEXPORT void setVIntervallName(const char* name);
+        DLLEXPORT void setVIntervalName(const char* name);
         //! Sets the name of the Y axis
         //! \param name The name
-        DLLEXPORT void setVIntervallName(Text* name);
-        //! Labels a specific value on the X axis, if the HIntervallTexte flag
-        //! was set in DiagramData \param hIntervall The value to label
+        DLLEXPORT void setVIntervalName(Text* name);
+        //! Labels a specific value on the X axis, if the HIntervalTexte flag
+        //! was set in DiagramData \param hInterval 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 DiagramData \param hIntervall The value to label
+        DLLEXPORT void addHIntervalText(double hInterval, const char* text);
+        //! Labels a specific value on the X axis, if the HIntervalTexte flag
+        //! was set in DiagramData \param hInterval The value to label
         //! \param text The label
-        DLLEXPORT void addHIntervallText(double hIntervall, Text* text);
+        DLLEXPORT void addHIntervalText(double hInterval, Text* text);
         //! Sets a pointer to a label for a specific value on the X axis,
-        //! if the HIntervallTexte flag was set in DiagramData
-        //! \param hIntervall The value to label
+        //! if the HIntervalTexte flag was set in DiagramData
+        //! \param hInterval The value to label
         //! \param text The label
-        DLLEXPORT void setHIntervallTextZ(double hIntervall, Text* text);
+        DLLEXPORT void setHIntervalTextZ(double hInterval, Text* text);
         //! Changes a label for a specific value on the X axis, if the
-        //! HIntervallTexte flag was set in DiagramData \param hIntervall The
+        //! HIntervalTexte flag was set in DiagramData \param hInterval The
         //! value to label \param text The label
-        DLLEXPORT void setHIntervallText(double hIntervall, Text* text);
+        DLLEXPORT void setHIntervalText(double hInterval, Text* text);
         //! Changes a label for a specific value on the X axis, if the
-        //! HIntervallTexte flag was set in DiagramData \param hIntervall The
+        //! HIntervalTexte flag was set in DiagramData \param hInterval The
         //! value to label \param text The label
-        DLLEXPORT void setHIntervallText(double hIntervall, const char* text);
+        DLLEXPORT void setHIntervalText(double hInterval, const char* text);
         //! Removes a label for a specific value on the X axis,
-        //! 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 DiagramData \param vIntervall The value to label
+        //! if the HIntervalTexte flag was set in DiagramData \param
+        //! hInterval The value that should no longer be labeled
+        DLLEXPORT void removeHIntervalText(double hInterval);
+        //! Labels a specific value on the Y axis, if the VIntervalTexte flag
+        //! was set in DiagramData \param vInterval 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 DiagramData \param vIntervall The value to label
+        DLLEXPORT void addVIntervalText(double vInterval, const char* text);
+        //! Labels a specific value on the Y axis, if the VIntervalTexte flag
+        //! was set in DiagramData \param vInterval The value to label
         //! \param text The label
-        DLLEXPORT void addVIntervallText(double vIntervall, Text* text);
+        DLLEXPORT void addVIntervalText(double vInterval, Text* text);
         //! Sets a pointer to a label for a specific value on the Y axis,
-        //! if the VIntervallTexte flag was set in DiagramData
-        //! \param vIntervall The value to label
+        //! if the VIntervalTexte flag was set in DiagramData
+        //! \param vInterval The value to label
         //! \param text The label
-        DLLEXPORT void setVIntervallTextZ(double vIntervall, Text* text);
+        DLLEXPORT void setVIntervalTextZ(double vInterval, Text* text);
         //! Changes a label for a specific value on the Y axis, if the
-        //! VIntervallTexte flag was set in DiagramData \param vIntervall The
+        //! VIntervalTexte flag was set in DiagramData \param vInterval The
         //! value to label \param text The label
-        DLLEXPORT void setVIntervallText(double vIntervall, Text* text);
+        DLLEXPORT void setVIntervalText(double vInterval, Text* text);
         //! Changes a label for a specific value on the Y axis, if the
-        //! VIntervallTexte flag was set in DiagramData \param vIntervall The
+        //! VIntervalTexte flag was set in DiagramData \param vInterval The
         //! value to label \param text The label
-        DLLEXPORT void setVIntervallText(double vIntervall, const char* text);
+        DLLEXPORT void setVIntervalText(double vInterval, const char* text);
         //! Removes a label for a specific value on the Y axis,
-        //! if the VIntervallTexte flag was set in DiagramData \param
-        //! vIntervall The value that should no longer be labeled
-        DLLEXPORT void removeVIntervallText(double vIntervall);
+        //! if the VIntervalTexte flag was set in DiagramData \param
+        //! vInterval The value that should no longer be labeled
+        DLLEXPORT void removeVIntervalText(double vInterval);
         //! Adds a value (graph) displayed in the diagram
         //! \param w The new value
-        DLLEXPORT void addWertZ(DiagramValue* w);
+        DLLEXPORT void addValueZ(DiagramValue* w);
         //! Adds a value (graph) displayed in the diagram by copying
         //! another \param w The value to copy
-        DLLEXPORT void addWert(DiagramValue* w);
+        DLLEXPORT void addValue(DiagramValue* w);
         //! Adds a value (graph) displayed in the diagram
         //! \param name The name of the value
-        DLLEXPORT void addWert(const char* name);
+        DLLEXPORT void addValue(const char* name);
         //! Adds a value (graph) displayed in the diagram
         //! \param name The name of the value
-        DLLEXPORT void addWert(Text* txt);
+        DLLEXPORT void addValue(Text* txt);
         //! Sets the color of a value
         //! \param wNum The index of the value
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setWertFarbe(int wNum, int fc);
+        DLLEXPORT void setValueColor(int wNum, int fc);
         //! Adds a point to a value
         //! \param wNum The index of the value
         //! \param p The new point
-        DLLEXPORT void addPunktZ(int wNum, DiagramPoint* p);
+        DLLEXPORT void addPointZ(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, DiagramPoint* p);
+        DLLEXPORT void addPoint(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
         //! \param vI The value of the point on the Y axis
-        DLLEXPORT void addPunkt(int wNum, double hI, double vI);
+        DLLEXPORT void addPoint(int wNum, double hI, double vI);
         //! Sets a pointer to an existing point of a value
         //! \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, DiagramPoint* p);
+        DLLEXPORT void setPointZ(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, DiagramPoint* p);
+        DLLEXPORT void setPoint(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
         //! \param h The X axis value of the new point \param v
         //! The Y axis value of the new point
-        DLLEXPORT void setPunkt(int wNum, double hI, double h, double v);
+        DLLEXPORT void setPoint(int wNum, double hI, double h, double v);
         //! Sets a pointer to an existing point of a value
         //! \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, DiagramPoint* p);
+        DLLEXPORT void setPointZ(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, DiagramPoint* p);
+        DLLEXPORT void setPoint(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
         //! \param h The X axis value of the new point
         //! \param v The Y axis value of the new point
-        DLLEXPORT void setPunkt(int wNum, int pNum, double h, double v);
+        DLLEXPORT void setPoint(int wNum, int pNum, double h, double v);
         //! Deletes an existing point
         //! \param wNum The index of the value
         //! \param hI The X axis value of the point to delete
-        DLLEXPORT void removePunkt(int wNum, double hI);
+        DLLEXPORT void removePoint(int wNum, double hI);
         //! Deletes an existing point
         //! \param wNum The index of the value
         //! \param pNum The index of the point in the value
-        DLLEXPORT void removePunkt(int wNum, int pNum);
+        DLLEXPORT void removePoint(int wNum, int pNum);
         //! Removes a value
         //! \param wNum The index of the value
-        DLLEXPORT void removeWert(int wNum);
+        DLLEXPORT void removeValue(int wNum);
         //! Removes a value
         //! \param name The name of the value
-        DLLEXPORT void removeWert(const char* name);
+        DLLEXPORT void removeValue(const char* name);
         //! Removes a value
         //! \param name The name of the value
-        DLLEXPORT void removeWert(Text* name);
+        DLLEXPORT void removeValue(Text* name);
         //! Adds styles to the DiagramData
         //! \param style The new styles
-        DLLEXPORT void addDatenStyle(int style);
+        DLLEXPORT void addDataStyle(int style);
         //! Sets the styles of the DiagramData
         //! \param style The new styles
-        DLLEXPORT void setDatenStyle(int style);
+        DLLEXPORT void setDataStyle(int style);
         //! 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);
+        DLLEXPORT void setDataStyle(int style, bool addRemove);
         //! Removes styles from the DiagramData
         //! \param style The styles to remove
-        DLLEXPORT void removeDatenStyle(int style);
+        DLLEXPORT void removeDataStyle(int style);
         //! Adds styles to a specific value
         //! \param wNum The index of the value
         //! \param style The new styles
-        DLLEXPORT void addWertStyle(int wNum, int style);
+        DLLEXPORT void addValueStyle(int wNum, int style);
         //! Sets the styles of a specific value
         //! \param wNum The index of the value
         //! \param style The new styles
-        DLLEXPORT void setWertStyle(int wNum, int style);
+        DLLEXPORT void setValueStyle(int wNum, int style);
         //! Sets the styles of a specific value
         //! \param wNum The index of the value
         //! \param style The styles
         //! \param addRemove 1 if the styles should be added. 0 if the styles
         //! should be removed
-        DLLEXPORT void setWertStyle(int wNum, int style, bool addRemove);
+        DLLEXPORT void setValueStyle(int wNum, int style, bool addRemove);
         //! Removes styles from a specific value
         //! \param wNum The index of the value
         //! \param style The styles to remove
-        DLLEXPORT void removeWertStyle(int wNum, int style);
+        DLLEXPORT void removeValueStyle(int wNum, int style);
         //! Returns the diagram data
         DLLEXPORT DiagramData* getDiagramData() const;
         //! Returns the diagram data without increased reference counter
@@ -513,17 +513,17 @@ namespace Framework
         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;
+        DLLEXPORT inline bool hasDataStyle(int style) const;
         //! Checks whether specific styles are not set in the DiagramData
         //! \param style The styles
-        DLLEXPORT inline bool hatDatenStyleNicht(int style) const;
+        DLLEXPORT inline bool hasDataStyleNot(int style) const;
         //! Checks whether specific styles are set for a specific value
         //! \param wNum The index of the value
         //! \param style The styles
-        DLLEXPORT inline bool hatWertStyle(int wNum, int style) const;
+        DLLEXPORT inline bool hasValueStyle(int wNum, int style) const;
         //! Checks whether specific styles are not set for a specific value
         //! \param wNum The index of the value \param style The styles
-        DLLEXPORT inline bool hatWertStyleNicht(int wNum, int style) const;
+        DLLEXPORT inline bool hasValueStyleNot(int wNum, int style) const;
     };
 
     //! A 2D GUI Framework drawing that displays diagram data as
@@ -536,21 +536,21 @@ namespace Framework
         {
         public:
             //! Determines whether a border is drawn around the data
-            static const __int64 DatenRahmen = 0x0001000;
+            static const __int64 DataBorder = 0x0001000;
             //! Determines whether the data has a background
-            static const __int64 DatenHintergrund = 0x02000;
+            static const __int64 DataBackground = 0x02000;
             //! Determines whether alpha blending is used when drawing
             //! the data background
-            static const __int64 DatenHAlpha = 0x04000;
+            static const __int64 DataHAlpha = 0x04000;
             //! Determines whether an image is used for the data background
-            static const __int64 DatenHImage = 0x008000;
+            static const __int64 DataHImage = 0x008000;
             //! Determines whether the data has a color gradient
-            static const __int64 DatenBuffered = 0x010000;
+            static const __int64 DataBuffered = 0x010000;
 
             //! Combines flags VScroll and HScroll
             static const __int64 scroll = VScroll | HScroll;
             //! Combines flags Background, scroll, DataBorder
-            static const __int64 normal = Hintergrund | scroll | DatenRahmen;
+            static const __int64 normal = Background | scroll | DataBorder;
         };
 
     private:
@@ -559,9 +559,9 @@ namespace Framework
         int dBgF;
         Image* dBgB;
         AlphaField* dAf;
-        Image* vIntervallRB;
-        Image* hIntervallRB;
-        int schriftGr;
+        Image* vIntervalRB;
+        Image* hIntervalRB;
+        int fontGr;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
         DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
@@ -575,11 +575,11 @@ namespace Framework
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets the font
-        //! \param schrift The font
-        DLLEXPORT void setFontZ(Font* schrift);
+        //! \param font The font
+        DLLEXPORT void setFontZ(Font* font);
         //! Sets the font size
         //! \param gr The height of a line in pixels
-        DLLEXPORT void setSchriftSize(int gr);
+        DLLEXPORT void setFontSize(int gr);
         //! Sets the inner border around the actual diagram (border around the
         //! data) \param ram The border
         DLLEXPORT void setDataBorderZ(Border* ram);
@@ -588,14 +588,14 @@ namespace Framework
         DLLEXPORT void setDataBorder(Border* ram);
         //! Sets the width of the inner border around the actual diagram
         //! (border around the data) \param br The width in pixels
-        DLLEXPORT void setDatenRahmenBreite(int br);
+        DLLEXPORT void setDataBorderWidth(int br);
         //! Sets the color of the inner border around the actual diagram
         //! (border around the data) \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setDatenRahmenFarbe(int fc);
+        DLLEXPORT void setDataBorderColor(int fc);
         //! Sets the background of the actual diagram
-        DLLEXPORT void setDatenHintergrundFarbe(int fc);
-        DLLEXPORT void setDatenHintergrundImageZ(Image* b);
-        DLLEXPORT void setDatenHintergrundImage(Image* b);
+        DLLEXPORT void setDataBackgroundColor(int fc);
+        DLLEXPORT void setDataBackgroundImageZ(Image* b);
+        DLLEXPORT void setDataBackgroundImage(Image* b);
         //! Sets the color gradient of the actual diagram (color gradient of
         //! the data) \param af The color gradient
         DLLEXPORT void setDataAlphaFieldZ(AlphaField* af);
@@ -605,10 +605,10 @@ namespace Framework
         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);
+        DLLEXPORT void setDataAlphaFieldColor(int fc);
         //! Sets the strength of the color gradient of the actual diagram
         //! (color gradient of the data) \param st The strength
-        DLLEXPORT void setDatenAlphaFeldStrength(int st);
+        DLLEXPORT void setDataAlphaFieldStrength(int st);
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
@@ -624,19 +624,19 @@ namespace Framework
         DLLEXPORT Border* zDataBorder() const;
         //! Returns the color of the inner border around the actual diagram in
         //! A8R8G8B8 format (border around the data)
-        DLLEXPORT int getDatenRahmenFarbe() const;
+        DLLEXPORT int getDataBorderColor() const;
         //! Returns the width of the inner border around the actual diagram in
         //! pixels (border around the data)
-        DLLEXPORT int getDatenRahmenBreite() const;
+        DLLEXPORT int getDataBorderWidth() const;
         //! Returns the background color of the actual diagram in
         //! A8R8G8B8 format (background of the data)
-        DLLEXPORT int getDatenHintergrundFarbe() const;
+        DLLEXPORT int getDataBackgroundColor() const;
         //! Returns the background image of the actual diagram
         //! (background image of the data)
-        DLLEXPORT Image* getDatenHintergrundImage() const;
+        DLLEXPORT Image* getDataBackgroundImage() const;
         //! Returns the background image of the actual diagram without increased
         //! reference counter (background image of the data)
-        DLLEXPORT Image* zDatenHintergrundImage() const;
+        DLLEXPORT Image* zDataBackgroundImage() const;
         //! Returns the color gradient of the actual diagram
         //! (color gradient of the data)
         DLLEXPORT AlphaField* getDataAlphaField() const;
@@ -645,10 +645,10 @@ namespace Framework
         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;
+        DLLEXPORT int getDataAlphaFieldColor() const;
         //! Returns the strength of the color gradient of the actual diagram
         //! (color gradient of the data)
-        DLLEXPORT int getDatenAlphaFeldStrength() const;
+        DLLEXPORT int getDataAlphaFieldStrength() const;
     };
 } // namespace Framework
 

Dialog.cpp

@@ -33,7 +33,7 @@ void MultiplChoiceDialog::addChoice(const char* text, void* id)
 }
 
 // shows the dialog and waits for user input
-void* MultiplChoiceDialog::anzeigen(Font* zFont)
+void* MultiplChoiceDialog::show(Font* zFont)
 {
     void* result = 0;
     bool ex = 0;
@@ -41,14 +41,14 @@ void* MultiplChoiceDialog::anzeigen(Font* zFont)
     WNDCLASS wc = F_Normal(0);
     wc.lpszClassName = "Dialog";
     NativeWindow* f = new NativeWindow();
-    f->setVSchliessAktion([&ex](void* p, void* o) { ex = true; });
-    f->setMausAktion(_ret1ME);
-    f->setTastaturAktion(_ret1TE);
-    f->erstellen(WS_OVERLAPPEDWINDOW, wc);
+    f->setPreCloseAction([&ex](void* p, void* o) { ex = true; });
+    f->setMouseAction(_ret1ME);
+    f->setKeyboardAction(_ret1TE);
+    f->create(WS_OVERLAPPEDWINDOW, wc);
     f->setSize(200, 200);
     f->setPosition(ScreenCenter(dynamic_cast<NativeWindow*>(f->getThis())));
-    f->setVerschiebbar(1);
-    f->setAnzeigeModus(1);
+    f->setMovable(1);
+    f->setDisplayMode(1);
     Screen* b = new Screen2D(dynamic_cast<NativeWindow*>(f->getThis()));
     f->setScreen(dynamic_cast<Screen*>(b->getThis()));
     b->update();
@@ -60,22 +60,22 @@ void* MultiplChoiceDialog::anzeigen(Font* zFont)
     SelectionBox* ab = new SelectionBox();
     ab->setPosition(10, 10);
     ab->setSize(180, 20);
-    ab->setHintergrundFarbe(0xFF000000);
+    ab->setBackgroundColor(0xFF000000);
     ab->setBorderWidth(1);
     ab->setBorderColor(0xFFFFFFFF);
     ab->setMaxAuskappHeight(120);
-    ab->setMausRahmenBreite(1);
-    ab->setMausRahmenFarbe(0xFF005500);
+    ab->setMouseBorderWidth(1);
+    ab->setMouseBorderColor(0xFF005500);
     ab->setMouseAlphaFieldColor(0x00008700);
-    ab->setMausAlphaFeldStrength(-8);
-    ab->setAuswRahmenBreite(1);
-    ab->setAuswRahmenFarbe(0xFF00FF00);
+    ab->setMouseAlphaFieldStrength(-8);
+    ab->setSelBorderWidth(1);
+    ab->setSelBorderColor(0xFF00FF00);
     ab->setSelAlphaFieldColor(0x0000FF00);
-    ab->setAuswAlphaFeldStrength(-8);
+    ab->setSelAlphaFieldStrength(-8);
     ab->setStyle(SelectionBox::Style::Normal);
     ab->setFontZ(dynamic_cast<Font*>(zFont->getThis()));
     for (Text* i : *entrys)
-        ab->addEintrag(i->getText());
+        ab->addEntry(i->getText());
     ab->setMouseEvent(_ret1ME);
     b->addMember(ab);
 
@@ -87,9 +87,9 @@ void* MultiplChoiceDialog::anzeigen(Font* zFont)
     ok->setText("Ok");
     ok->setMouseEvent(
         [this, &ex, &result, ab](void* p, void* o, MouseEvent me) {
-            if (me.id == ME_RLinks)
+            if (me.id == ME_RLeft)
             {
-                result = ids->get(ab->getAuswahl());
+                result = ids->get(ab->getSelection());
                 ex = true;
             }
             return 1;
@@ -106,13 +106,13 @@ void* MultiplChoiceDialog::anzeigen(Font* zFont)
         }
     }
 
-    r->beenden();
+    r->terminate();
     r->release();
 
     b->release();
     f->setScreen(0);
-    f->setAnzeigeModus(0);
-    f->zerstoeren();
+    f->setDisplayMode(0);
+    f->destroy();
     f->release();
 
     ok->release();

Dialog.h

@@ -20,6 +20,6 @@ namespace Framework
         //! Adds a selection option
         DLLEXPORT void addChoice(const char* text, void* id);
         //! Shows the dialog and waits for user input
-        DLLEXPORT void* anzeigen(Font* zFont);
+        DLLEXPORT void* show(Font* zFont);
     };
 } // namespace Framework

Drawing.cpp

@@ -33,7 +33,7 @@ Drawable::Drawable()
       ntakParam(0),
       nMak(0),
       nTak(0),
-      mausIn(0),
+      mouseIn(0),
       toolTip(0),
       style(0),
       rend(0),
@@ -49,7 +49,7 @@ Drawable::~Drawable()
 
 void Drawable::doMouseEvent(MouseEvent& me, bool userRet)
 {
-    me.verarbeitet = userRet;
+    me.processed = userRet;
 }
 
 // non-constant
@@ -68,19 +68,19 @@ void Drawable::setToolTipText(
         if (!toolTip)
         {
             toolTip = new ToolTip(zScreen);
-            toolTip->addStyle(DrawableBackground::Style::Hintergrund
+            toolTip->addStyle(DrawableBackground::Style::Background
                               | DrawableBackground::Style::HAlpha
                               | DrawableBackground::Style::Border
-                              | DrawableBackground::Style::Sichtbar);
-            toolTip->setHintergrundFarbe(0xA0000000);
+                              | DrawableBackground::Style::Visible);
+            toolTip->setBackgroundColor(0xA0000000);
             toolTip->setBorderColor(0xFFFFFFFF);
             toolTip->setBorderWidth(1);
-            if (mausIn && toolTip) toolTip->setMausIn(1);
+            if (mouseIn && toolTip) toolTip->setMouseIn(1);
         }
         UIInit init = defaultUI(zFont, zScreen);
         TextField* t = init.createTextField(init.initParam);
         t->setText(txt);
-        t->setSize(t->zTextRenderer()->getTextBreite(txt),
+        t->setSize(t->zTextRenderer()->getTextWidth(txt),
             t->zTextRenderer()->getTextHeight(txt));
         toolTip->addMember(t);
     }
@@ -91,7 +91,7 @@ void Drawable::setToolTipText(
 // if one does not exist yet
 //  initToolTip: the function
 void Drawable::setNeedToolTipEvent(
-    std::function<bool(Drawable*, Punkt localPos)> onNeedToolTip)
+    std::function<bool(Drawable*, Point localPos)> onNeedToolTip)
 {
     this->onNeedToolTip = onNeedToolTip;
 }
@@ -102,7 +102,7 @@ void Drawable::setToolTipZ(ToolTip* tt)
 {
     if (toolTip) toolTip->release();
     toolTip = tt;
-    if (mausIn && toolTip) toolTip->setMausIn(1);
+    if (mouseIn && toolTip) toolTip->setMouseIn(1);
     toolTipRequested = 0;
 }
 
@@ -128,12 +128,12 @@ void Drawable::setKeyboardEventParameter(
     takParam = p;
 }
 
-void Drawable::setMouseEvent(MausAktion ak) // sets the mouse event
+void Drawable::setMouseEvent(MouseAction ak) // sets the mouse event
 {
     mak = ak;
 }
 
-void Framework::Drawable::addMouseEvent(MausAktion ak)
+void Framework::Drawable::addMouseEvent(MouseAction ak)
 {
     if (!mak)
     {
@@ -141,7 +141,7 @@ void Framework::Drawable::addMouseEvent(MausAktion ak)
     }
     else
     {
-        MausAktion old = mak;
+        MouseAction old = mak;
         mak = [old, ak](void* p, void* o, MouseEvent me) {
             return old(p, o, me) && ak(p, o, me);
         };
@@ -149,12 +149,12 @@ void Framework::Drawable::addMouseEvent(MausAktion ak)
 }
 
 void Drawable::setKeyboardEvent(
-    TastaturAktion ak) // sets the keyboard event
+    KeyboardAction ak) // sets the keyboard event
 {
     tak = ak;
 }
 
-void Framework::Drawable::addKeyboardEvent(TastaturAktion ak)
+void Framework::Drawable::addKeyboardEvent(KeyboardAction ak)
 {
     if (!tak)
     {
@@ -162,7 +162,7 @@ void Framework::Drawable::addKeyboardEvent(TastaturAktion ak)
     }
     else
     {
-        TastaturAktion old = tak;
+        KeyboardAction old = tak;
         tak = [old, ak](void* p, void* o, KeyboardEvent te) {
             return old(p, o, te) && ak(p, o, te);
         };
@@ -181,87 +181,87 @@ void Drawable::setNKeyboardEventParameter(
     ntakParam = p;
 }
 
-void Drawable::setNMouseEvent(MausAktion ak) // sets the mouse event
+void Drawable::setNMouseEvent(MouseAction ak) // sets the mouse event
 {
     nMak = ak;
 }
 
 void Drawable::setNKeyboardEvent(
-    TastaturAktion ak) // sets the keyboard event
+    KeyboardAction ak) // sets the keyboard event
 {
     nTak = ak;
 }
 
 void Drawable::doPublicMouseEvent(MouseEvent& me) // calls Mak
 {
-    bool lock = hatStyle(Style::MELockDrawable);
+    bool lock = hasStyle(Style::MELockDrawable);
     if (lock) lockDrawable();
-    bool inside = istPunktInnen(me.mx, me.my);
-    if (!me.insideParent || me.verarbeitet || !inside)
+    bool inside = isPointInside(me.mx, me.my);
+    if (!me.insideParent || me.processed || !inside)
     {
-        if (mausIn)
+        if (mouseIn)
         {
-            mausIn = 0;
-            if (toolTip) toolTip->setMausIn(0);
+            mouseIn = 0;
+            if (toolTip) toolTip->setMouseIn(0);
             MouseEvent me2;
             me2.id = ME_Leaves;
             me2.mx = me.mx - pos.x;
             me2.my = me.my - pos.y;
-            me2.verarbeitet = 0;
+            me2.processed = 0;
             me2.insideParent = me.insideParent;
             bool userRet = mak && mak(makParam, this, me2);
             doMouseEvent(me2, userRet);
         }
     }
-    if (!inside && me.id == ME_PLinks) removeStyle(Style::Fokus);
-    if ((me.verarbeitet && hatStyleNicht(Style::MEIgnoreVerarbeitet))
-        || (!inside && hatStyleNicht(Style::MEIgnoreInside))
-        || (hatStyleNicht(Style::Sichtbar)
-            && hatStyleNicht(Style::MEIgnoreSichtbar)))
+    if (!inside && me.id == ME_PLeft) removeStyle(Style::Focus);
+    if ((me.processed && hasStyleNot(Style::MEIgnoreProcessed))
+        || (!inside && hasStyleNot(Style::MEIgnoreInside))
+        || (hasStyleNot(Style::Visible)
+            && hasStyleNot(Style::MEIgnoreVisible)))
     {
         if (lock) unlockDrawable();
         return;
     }
-    if (inside && me.id == ME_PLinks) addStyle(Style::Fokus);
-    if (me.insideParent && !mausIn && me.id != ME_Leaves && inside
-        && !me.verarbeitet && hatStyle(Style::Sichtbar))
+    if (inside && me.id == ME_PLeft) addStyle(Style::Focus);
+    if (me.insideParent && !mouseIn && me.id != ME_Leaves && inside
+        && !me.processed && hasStyle(Style::Visible))
     {
-        mausIn = 1;
+        mouseIn = 1;
         if (toolTip)
-            toolTip->setMausIn(1);
+            toolTip->setMouseIn(1);
         else if (onNeedToolTip && !toolTipRequested)
         {
             toolTipRequested
-                = onNeedToolTip(this, Punkt(me.mx - pos.x, me.my - pos.y));
+                = onNeedToolTip(this, Point(me.mx - pos.x, me.my - pos.y));
         }
         MouseEvent me2;
-        me2.id = ME_Betritt;
+        me2.id = ME_Enter;
         me2.mx = me.mx - pos.x;
         me2.my = me.my - pos.y;
-        me2.verarbeitet = 0;
+        me2.processed = 0;
         me2.insideParent = 1;
         bool userRet = mak && mak(makParam, this, me2);
         doMouseEvent(me2, userRet);
     }
-    else if (me.insideParent && mausIn && me.id != ME_Leaves && inside
-             && !me.verarbeitet && hatStyle(Style::Sichtbar) && !toolTip
+    else if (me.insideParent && mouseIn && me.id != ME_Leaves && inside
+             && !me.processed && hasStyle(Style::Visible) && !toolTip
              && onNeedToolTip && !toolTipRequested)
     {
         toolTipRequested
-            = onNeedToolTip(this, Punkt(me.mx - pos.x, me.my - pos.y));
+            = onNeedToolTip(this, Point(me.mx - pos.x, me.my - pos.y));
     }
-    Punkt old = Punkt(me.mx, me.my);
+    Point old = Point(me.mx, me.my);
     me.mx -= pos.x, me.my -= pos.y;
-    if (me.insideParent || hatStyle(Style::MEIgnoreParentInside))
+    if (me.insideParent || hasStyle(Style::MEIgnoreParentInside))
     {
-        bool userRet = hatStyle(Style::Erlaubt)
-                    && (me.verarbeitet || !me.insideParent
+        bool userRet = hasStyle(Style::Allowed)
+                    && (me.processed || !me.insideParent
                         || (inside && mak && mak(makParam, this, me)));
-        bool vera = me.verarbeitet;
+        bool vera = me.processed;
         doMouseEvent(me, userRet);
-        if (nMak && me.verarbeitet && !vera && hatStyle(Style::Erlaubt)
+        if (nMak && me.processed && !vera && hasStyle(Style::Allowed)
             && me.insideParent && inside)
-            me.verarbeitet = nMak(nmakParam, this, me);
+            me.processed = nMak(nmakParam, this, me);
     }
     me.mx = old.x, me.my = old.y;
     if (lock) unlockDrawable();
@@ -269,12 +269,12 @@ void Drawable::doPublicMouseEvent(MouseEvent& me) // calls Mak
 
 void Drawable::doKeyboardEvent(KeyboardEvent& te) // calls Tak
 {
-    if (te.verarbeitet) return;
-    if (tak) te.verarbeitet |= tak(takParam, this, te);
-    if (nTak && te.verarbeitet) te.verarbeitet = nTak(ntakParam, this, te);
+    if (te.processed) return;
+    if (tak) te.processed |= tak(takParam, this, te);
+    if (nTak && te.processed) te.processed = nTak(ntakParam, this, te);
 }
 
-void Drawable::setPosition(const Punkt& pos) // sets the position
+void Drawable::setPosition(const Point& pos) // sets the position
 {
     lockDrawable();
     if (this->pos != pos) rend = 1;
@@ -304,7 +304,7 @@ void Drawable::setY(int yPos)
     unlockDrawable();
 }
 
-void Drawable::setSize(const Punkt& gr) // sets the size
+void Drawable::setSize(const Point& gr) // sets the size
 {
     lockDrawable();
     if (this->gr != gr) rend = 1;
@@ -314,12 +314,12 @@ void Drawable::setSize(const Punkt& gr) // sets the size
 
 void Drawable::setPosition(int x, int y) // sets the position
 {
-    setPosition(Punkt(x, y));
+    setPosition(Point(x, y));
 }
 
 void Drawable::setSize(int x, int y) // sets the size
 {
-    setSize(Punkt(x, y));
+    setSize(Point(x, y));
 }
 
 void Drawable::setWidth(int width)
@@ -363,8 +363,8 @@ void Drawable::setStyle(__int64 style, bool add_remove)
     }
     else if (!add_remove && (this->style & ~style) != this->style)
     {
-        if (toolTip && (style | Style::Sichtbar) == style)
-            toolTip->setMausIn(0);
+        if (toolTip && (style | Style::Visible) == style)
+            toolTip->setMouseIn(0);
         this->style &= ~style;
         rend = 1;
     }
@@ -383,8 +383,8 @@ void Drawable::removeStyle(__int64 style)
 {
     if ((this->style & ~style) != this->style)
     {
-        if (toolTip && (style | Style::Sichtbar) == style)
-            toolTip->setMausIn(0);
+        if (toolTip && (style | Style::Visible) == style)
+            toolTip->setMouseIn(0);
         this->style &= ~style;
         rend = 1;
     }
@@ -392,7 +392,7 @@ void Drawable::removeStyle(__int64 style)
 
 void Drawable::render(Image& zRObj)
 {
-    if (toolTip && (style | Style::Sichtbar) == style) toolTip->setZeichnen();
+    if (toolTip && (style | Style::Visible) == style) toolTip->setDrawing();
 }
 
 // constant
@@ -406,17 +406,17 @@ bool Drawable::hasKeyboardEvent() const // checks if Tak is set
     return tak != 0;
 }
 
-const Punkt& Drawable::getPosition() const // returns the position
+const Point& Drawable::getPosition() const // returns the position
 {
     return pos;
 }
 
-const Punkt& Drawable::getSize() const // returns the size
+const Point& Drawable::getSize() const // returns the size
 {
     return gr;
 }
 
-int Drawable::getBreite() const // returns the width
+int Drawable::getWidth() const // returns the width
 {
     return gr.x;
 }
@@ -427,7 +427,7 @@ int Drawable::getHeight() const // returns the height
 }
 
 // Returns the width of the interior area of the drawing in pixels
-int Drawable::getInnenBreite() const
+int Drawable::getInnerWidth() const
 {
     return gr.x;
 }
@@ -451,16 +451,16 @@ int Drawable::getY() const // returns Y
 // Checks if a point is inside this object
 //  p: the point
 //  return: 1 if the point is inside, 0 otherwise
-bool Drawable::istPunktInnen(Punkt p) const
+bool Drawable::isPointInside(Point p) const
 {
-    return istPunktInnen(p.x, p.y);
+    return isPointInside(p.x, p.y);
 }
 
 // Checks if a point is inside this object
 //  x: the x coordinate of the point
 //  y: the y coordinate of the point
 //  return: 1 if the point is inside, 0 otherwise
-bool Drawable::istPunktInnen(int x, int y) const
+bool Drawable::isPointInside(int x, int y) const
 {
     return x >= pos.x && x <= pos.x + gr.x && y >= pos.y && y <= pos.y + gr.y;
 }
@@ -475,12 +475,12 @@ ToolTip* Drawable::zToolTip() const
     return toolTip;
 }
 
-bool Drawable::hatStyle(__int64 style) const // checks if style is present
+bool Drawable::hasStyle(__int64 style) const // checks if style is present
 {
     return (this->style | style) == this->style;
 }
 
-bool Drawable::hatStyleNicht(
+bool Drawable::hasStyleNot(
     __int64 style) const // checks if style is not present
 {
     return (this->style | style) != this->style;
@@ -491,7 +491,7 @@ __int64 Framework::Drawable::getStyles() const
     return style;
 }
 
-Drawable* Drawable::dublizieren() const // Creates a copy of the drawing
+Drawable* Drawable::duplicate() const // Creates a copy of the drawing
 {
     Drawable* obj = new Drawable();
     obj->setPosition(pos);
@@ -500,7 +500,7 @@ Drawable* Drawable::dublizieren() const // Creates a copy of the drawing
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     return obj;
 }
 
@@ -509,10 +509,10 @@ Drawable* Drawable::dublizieren() const // Creates a copy of the drawing
 DrawableBackground::DrawableBackground()
     : Drawable()
 {
-    hintergrundFarbe = 0xFF000000;
-    rahmen = 0;
-    hintergrundImage = 0;
-    hintergrundFeld = 0;
+    backgroundColor = 0xFF000000;
+    border = 0;
+    backgroundImage = 0;
+    backgroundFeld = 0;
     horizontalScrollBar = 0;
     vertikalScrollBar = 0;
     innenPosition.x = 0;
@@ -524,9 +524,9 @@ DrawableBackground::DrawableBackground()
 // Destructor
 DrawableBackground::~DrawableBackground()
 {
-    if (rahmen) rahmen->release();
-    if (hintergrundImage) hintergrundImage->release();
-    if (hintergrundFeld) hintergrundFeld->release();
+    if (border) border->release();
+    if (backgroundImage) backgroundImage->release();
+    if (backgroundFeld) backgroundFeld->release();
     if (horizontalScrollBar) horizontalScrollBar->release();
     if (vertikalScrollBar) vertikalScrollBar->release();
 }
@@ -536,54 +536,54 @@ void DrawableBackground::doMouseEvent(MouseEvent& me, bool userRet)
     if (userRet)
     {
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
-        bool vs = hatStyle(Style::VScroll) && vertikalScrollBar;
-        bool hs = hatStyle(Style::HScroll) && horizontalScrollBar;
+        if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
+        bool vs = hasStyle(Style::VScroll) && vertikalScrollBar;
+        bool hs = hasStyle(Style::HScroll) && horizontalScrollBar;
         if (vs)
         {
             if (hs)
-                horizontalScrollBar->doMausMessage(
+                horizontalScrollBar->doMouseMessage(
                     rbr, gr.y - rbr - 15, gr.x - rbr * 2 - 15, 15, me);
-            vertikalScrollBar->doMausMessage(
+            vertikalScrollBar->doMouseMessage(
                 gr.x - rbr - 15, rbr, 15, gr.y - rbr * 2, me);
         }
         else if (hs)
-            horizontalScrollBar->doMausMessage(
+            horizontalScrollBar->doMouseMessage(
                 rbr, gr.y - rbr - 15, gr.x - rbr * 2, 15, me);
     }
-    me.verarbeitet = userRet;
+    me.processed = userRet;
 }
 
-void DrawableBackground::setHintergrundImage(
+void DrawableBackground::setBackgroundImage(
     Image* bild) // sets the background image
 {
-    if (!hintergrundImage) hintergrundImage = new Image();
-    hintergrundImage->neuImage(bild->getBreite(), bild->getHeight(), 0);
-    int* buff1 = hintergrundImage->getBuffer();
+    if (!backgroundImage) backgroundImage = new Image();
+    backgroundImage->newImage(bild->getWidth(), bild->getHeight(), 0);
+    int* buff1 = backgroundImage->getBuffer();
     int* buff2 = bild->getBuffer();
-    for (int i = 0; i < bild->getBreite() * bild->getHeight(); ++i)
+    for (int i = 0; i < bild->getWidth() * bild->getHeight(); ++i)
         buff1[i] = buff2[i];
     bild->release();
     rend = 1;
 }
 
-void DrawableBackground::setHintergrundImageZ(
+void DrawableBackground::setBackgroundImageZ(
     Image* bild) // sets a pointer to the background image
 {
-    if (hintergrundImage != bild)
+    if (backgroundImage != bild)
     {
-        if (hintergrundImage) hintergrundImage->release();
-        hintergrundImage = bild;
+        if (backgroundImage) backgroundImage->release();
+        backgroundImage = bild;
         rend = 1;
     }
 }
 
-void DrawableBackground::setHintergrundFarbe(
+void DrawableBackground::setBackgroundColor(
     int fc) // sets the background color
 {
-    if (hintergrundFarbe != fc)
+    if (backgroundColor != fc)
     {
-        hintergrundFarbe = fc;
+        backgroundColor = fc;
         rend = 1;
     }
 }
@@ -591,10 +591,10 @@ void DrawableBackground::setHintergrundFarbe(
 void DrawableBackground::setAlphaFieldZ(
     AlphaField* buff) // sets a pointer to the background buffer
 {
-    if (hintergrundFeld != buff)
+    if (backgroundFeld != buff)
     {
-        if (hintergrundFeld) hintergrundFeld->release();
-        hintergrundFeld = buff;
+        if (backgroundFeld) backgroundFeld->release();
+        backgroundFeld = buff;
         rend = 1;
     }
 }
@@ -602,14 +602,14 @@ void DrawableBackground::setAlphaFieldZ(
 void DrawableBackground::setAlphaFieldStrength(
     int st) // sets the strength of the background buffer
 {
-    if (!hintergrundFeld)
+    if (!backgroundFeld)
     {
-        hintergrundFeld = new AlphaField();
+        backgroundFeld = new AlphaField();
         rend = 1;
     }
-    if (hintergrundFeld->getStrength() != st)
+    if (backgroundFeld->getStrength() != st)
     {
-        hintergrundFeld->setStrength(st);
+        backgroundFeld->setStrength(st);
         rend = 1;
     }
 }
@@ -617,14 +617,14 @@ void DrawableBackground::setAlphaFieldStrength(
 void DrawableBackground::setAlphaFieldColor(
     int fc) // sets the color of the background buffer
 {
-    if (!hintergrundFeld)
+    if (!backgroundFeld)
     {
-        hintergrundFeld = new AlphaField();
+        backgroundFeld = new AlphaField();
         rend = 1;
     }
-    if (hintergrundFeld->getFarbe() != fc)
+    if (backgroundFeld->getColor() != fc)
     {
-        hintergrundFeld->setFarbe(fc);
+        backgroundFeld->setColor(fc);
         rend = 1;
     }
 }
@@ -632,43 +632,43 @@ void DrawableBackground::setAlphaFieldColor(
 void DrawableBackground::setBorderZ(
     Border* ram) // sets a pointer to the border
 {
-    if (rahmen != ram)
+    if (border != ram)
     {
-        if (rahmen) rahmen->release();
-        rahmen = ram;
+        if (border) border->release();
+        border = ram;
         rend = 1;
     }
 }
 
 void DrawableBackground::setBorderWidth(int br) // sets the border width
 {
-    if (!rahmen)
+    if (!border)
     {
-        rahmen = new LBorder();
+        border = new LBorder();
         rend = 1;
     }
-    if (rahmen->getRBreite() != br)
+    if (border->getRWidth() != br)
     {
-        rahmen->setRamenBreite(br);
+        border->setBorderWidth(br);
         rend = 1;
     }
 }
 
 void DrawableBackground::setBorderColor(int fc) // sets the border color
 {
-    if (!rahmen)
+    if (!border)
     {
-        rahmen = new LBorder();
+        border = new LBorder();
         rend = 1;
     }
-    if (rahmen->getFarbe() != fc)
+    if (border->getColor() != fc)
     {
-        rahmen->setFarbe(fc);
+        border->setColor(fc);
         rend = 1;
     }
 }
 
-void DrawableBackground::setVertikalKlickScroll(
+void DrawableBackground::setVerticalClickScroll(
     int ks) // sets the vertical scroll speed
 {
     if (!vertikalScrollBar)
@@ -676,14 +676,14 @@ void DrawableBackground::setVertikalKlickScroll(
         vertikalScrollBar = new VScrollBar();
         rend = 1;
     }
-    if (vertikalScrollBar->getKlickScroll() != ks)
+    if (vertikalScrollBar->getClickScroll() != ks)
     {
-        vertikalScrollBar->setKlickScroll(ks);
+        vertikalScrollBar->setClickScroll(ks);
         rend = 1;
     }
 }
 
-void DrawableBackground::setVertikalScrollPos(
+void DrawableBackground::setVerticalScrollPos(
     int pos) // sets the vertical scroll position
 {
     if (!vertikalScrollBar)
@@ -698,7 +698,7 @@ void DrawableBackground::setVertikalScrollPos(
     }
 }
 
-void DrawableBackground::setVertikalScrollFarbe(
+void DrawableBackground::setVerticalScrollColor(
     int f, int bgF) // sets the scroll color
 {
     if (!vertikalScrollBar)
@@ -707,16 +707,16 @@ void DrawableBackground::setVertikalScrollFarbe(
         rend = 1;
     }
     if (vertikalScrollBar
-        && (vertikalScrollBar->getFarbe() != f
-            || vertikalScrollBar->getBgFarbe() != bgF))
+        && (vertikalScrollBar->getColor() != f
+            || vertikalScrollBar->getBgColor() != bgF))
     {
-        vertikalScrollBar->setFarbe(f);
-        vertikalScrollBar->setBgFarbe(bgF, bgF != 0);
+        vertikalScrollBar->setColor(f);
+        vertikalScrollBar->setBgColor(bgF, bgF != 0);
         rend = 1;
     }
 }
 
-void DrawableBackground::setHorizontalKlickScroll(
+void DrawableBackground::setHorizontalClickScroll(
     int ks) // sets the horizontal scroll speed
 {
     if (!horizontalScrollBar)
@@ -724,9 +724,9 @@ void DrawableBackground::setHorizontalKlickScroll(
         horizontalScrollBar = new HScrollBar();
         rend = 1;
     }
-    if (horizontalScrollBar && horizontalScrollBar->getKlickScroll() != ks)
+    if (horizontalScrollBar && horizontalScrollBar->getClickScroll() != ks)
     {
-        horizontalScrollBar->setKlickScroll(ks);
+        horizontalScrollBar->setClickScroll(ks);
         rend = 1;
     }
 }
@@ -746,7 +746,7 @@ void DrawableBackground::setHorizontalScrollPos(
     }
 }
 
-void DrawableBackground::setHorizontalScrollFarbe(
+void DrawableBackground::setHorizontalScrollColor(
     int f, int bgF) // sets the scroll color
 {
     if (!horizontalScrollBar)
@@ -755,21 +755,21 @@ void DrawableBackground::setHorizontalScrollFarbe(
         rend = 1;
     }
     if (horizontalScrollBar
-        && (horizontalScrollBar->getFarbe() != f
-            || horizontalScrollBar->getBgFarbe() != bgF))
+        && (horizontalScrollBar->getColor() != f
+            || horizontalScrollBar->getBgColor() != bgF))
     {
-        horizontalScrollBar->setFarbe(f);
-        horizontalScrollBar->setBgFarbe(bgF, bgF != 0);
+        horizontalScrollBar->setColor(f);
+        horizontalScrollBar->setBgColor(bgF, bgF != 0);
         rend = 1;
     }
 }
 
 bool DrawableBackground::tick(double tickVal)
 {
-    if (vertikalScrollBar && hatStyle(Style::VScroll))
-        rend |= vertikalScrollBar->getRend();
-    if (horizontalScrollBar && hatStyle(Style::HScroll))
-        rend |= horizontalScrollBar->getRend();
+    if (vertikalScrollBar && hasStyle(Style::VScroll))
+        rend |= vertikalScrollBar->getNeedRender();
+    if (horizontalScrollBar && hasStyle(Style::HScroll))
+        rend |= horizontalScrollBar->getNeedRender();
     return Drawable::tick(tickVal);
 }
 
@@ -779,7 +779,7 @@ void DrawableBackground::render(Image& rObj)
     innenPosition.y = pos.y;
     innenSize.x = gr.x;
     innenSize.y = gr.y;
-    if (hatStyleNicht(Style::Sichtbar)) return;
+    if (hasStyleNot(Style::Visible)) return;
     lockDrawable();
     if (!rObj.setDrawOptions(pos.x, pos.y, gr.x, gr.y))
     {
@@ -788,11 +788,11 @@ void DrawableBackground::render(Image& rObj)
     }
     Drawable::render(rObj);
     int rbr = 0;
-    if (hatStyle(Style::Border) && rahmen)
+    if (hasStyle(Style::Border) && border)
     {
-        rahmen->setSize(gr);
-        rahmen->render(rObj);
-        rbr = rahmen->getRBreite();
+        border->setSize(gr);
+        border->render(rObj);
+        rbr = border->getRWidth();
     }
     innenPosition.x += rbr;
     innenPosition.y += rbr;
@@ -804,8 +804,8 @@ void DrawableBackground::render(Image& rObj)
         unlockDrawable();
         return;
     }
-    bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
-    bool hs = horizontalScrollBar && hatStyle(Style::HScroll);
+    bool vs = vertikalScrollBar && hasStyle(Style::VScroll);
+    bool hs = horizontalScrollBar && hasStyle(Style::HScroll);
     if (vs)
     {
         vertikalScrollBar->render(
@@ -853,42 +853,42 @@ void DrawableBackground::render(Image& rObj)
             return;
         }
     }
-    if (hatStyle(Style::Hintergrund))
+    if (hasStyle(Style::Background))
     {
-        if (hatStyle(Style::HAlpha))
+        if (hasStyle(Style::HAlpha))
             rObj.alphaRegion(
-                0, 0, gr.x - rbr * 2, gr.y - rbr * 2, hintergrundFarbe);
+                0, 0, gr.x - rbr * 2, gr.y - rbr * 2, backgroundColor);
         else
             rObj.fillRegion(
-                0, 0, gr.x - rbr * 2, gr.y - rbr * 2, hintergrundFarbe);
-        if (hatStyle(Style::HImage) && hintergrundImage)
+                0, 0, gr.x - rbr * 2, gr.y - rbr * 2, backgroundColor);
+        if (hasStyle(Style::HImage) && backgroundImage)
         {
-            if (hatStyle(Style::HImageScale))
+            if (hasStyle(Style::HImageScale))
             {
-                if (hatStyle(Style::HAlpha))
-                    rObj.alphaImageSkall(
-                        0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundImage);
+                if (hasStyle(Style::HAlpha))
+                    rObj.alphaImageScaled(
+                        0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *backgroundImage);
                 else
-                    rObj.drawImageSkall(
-                        0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundImage);
+                    rObj.drawImageScaled(
+                        0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *backgroundImage);
             }
             else
             {
-                int x = (gr.x - rbr * 2 - hintergrundImage->getSize().x) / 2;
-                int y = (gr.y - rbr * 2 - hintergrundImage->getSize().y) / 2;
-                if (hatStyle(Style::HAlpha))
+                int x = (gr.x - rbr * 2 - backgroundImage->getSize().x) / 2;
+                int y = (gr.y - rbr * 2 - backgroundImage->getSize().y) / 2;
+                if (hasStyle(Style::HAlpha))
                     rObj.alphaImage(
-                        x, y, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundImage);
+                        x, y, gr.x - rbr * 2, gr.y - rbr * 2, *backgroundImage);
                 else
                     rObj.drawImage(
-                        x, y, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundImage);
+                        x, y, gr.x - rbr * 2, gr.y - rbr * 2, *backgroundImage);
             }
         }
     }
-    if (hatStyle(Style::Buffered) && hintergrundFeld)
+    if (hasStyle(Style::Buffered) && backgroundFeld)
     {
-        hintergrundFeld->setSize(gr.x - rbr * 2, gr.y - rbr * 2);
-        hintergrundFeld->render(rObj);
+        backgroundFeld->setSize(gr.x - rbr * 2, gr.y - rbr * 2);
+        backgroundFeld->render(rObj);
     }
     if (vs || hs) rObj.releaseDrawOptions();
     rObj.releaseDrawOptions();
@@ -897,9 +897,9 @@ void DrawableBackground::render(Image& rObj)
 }
 
 // Returns the width of the interior area of the drawing in pixels
-int DrawableBackground::getInnenBreite() const
+int DrawableBackground::getInnerWidth() const
 {
-    return getBreite() - 2 * getBorderWidth();
+    return getWidth() - 2 * getBorderWidth();
 }
 
 // Returns the height of the interior area of the drawing in pixels
@@ -908,97 +908,97 @@ int DrawableBackground::getInnenHeight() const
     return getHeight() - 2 * getBorderWidth();
 }
 
-Image* DrawableBackground::getHintergrundImage()
+Image* DrawableBackground::getBackgroundImage()
     const // returns the background image
 {
-    if (!hintergrundImage) return 0;
-    return dynamic_cast<Image*>(hintergrundImage->getThis());
+    if (!backgroundImage) return 0;
+    return dynamic_cast<Image*>(backgroundImage->getThis());
 }
 
-Image* DrawableBackground::zHintergrundImage()
+Image* DrawableBackground::zBackgroundImage()
     const // returns the background image without increased reference counter
 {
-    return hintergrundImage;
+    return backgroundImage;
 }
 
-int DrawableBackground::getHintergrundFarbe()
+int DrawableBackground::getBackgroundColor()
     const // returns the background color
 {
-    return hintergrundFarbe;
+    return backgroundColor;
 }
 
 AlphaField*
 DrawableBackground::getAlphaField() const // returns the background buffer
 {
-    if (!hintergrundFeld) return 0;
-    return dynamic_cast<AlphaField*>(hintergrundFeld->getThis());
+    if (!backgroundFeld) return 0;
+    return dynamic_cast<AlphaField*>(backgroundFeld->getThis());
 }
 
 AlphaField* DrawableBackground::zAlphaField()
     const // returns the background buffer without increased reference counter
 {
-    return hintergrundFeld;
+    return backgroundFeld;
 }
 
 int DrawableBackground::getAlphaFieldStrength()
     const // returns the strength of the background buffer
 {
-    if (!hintergrundFeld) return 0;
-    return hintergrundFeld->getStrength();
+    if (!backgroundFeld) return 0;
+    return backgroundFeld->getStrength();
 }
 
 int DrawableBackground::getAlphaFieldColor()
     const // returns the color of the background buffer
 {
-    return hintergrundFeld->getFarbe();
+    return backgroundFeld->getColor();
 }
 
 Border* DrawableBackground::getBorder() const // returns the border
 {
-    if (!rahmen) return 0;
-    return dynamic_cast<Border*>(rahmen->getThis());
+    if (!border) return 0;
+    return dynamic_cast<Border*>(border->getThis());
 }
 
 Border* DrawableBackground::zBorder()
     const // returns the border without increased reference counter
 {
-    return rahmen;
+    return border;
 }
 
 int DrawableBackground::getBorderWidth() const // returns the border width
 {
-    if (!rahmen || hatStyleNicht(Style::Border)) return 0;
-    return rahmen->getRBreite();
+    if (!border || hasStyleNot(Style::Border)) return 0;
+    return border->getRWidth();
 }
 
 int DrawableBackground::getBorderColor() const // returns the border color
 {
-    return rahmen->getFarbe();
+    return border->getColor();
 }
 
-int DrawableBackground::getVertikalKlickScroll() const
+int DrawableBackground::getVerticalClickScroll() const
 {
-    return vertikalScrollBar ? vertikalScrollBar->getKlickScroll() : 0;
+    return vertikalScrollBar ? vertikalScrollBar->getClickScroll() : 0;
 }
 
-int DrawableBackground::getVertikalScrollPos() const
+int DrawableBackground::getVerticalScrollPos() const
 {
     return vertikalScrollBar ? vertikalScrollBar->getScroll() : 0;
 }
 
-int DrawableBackground::getVertikalScrollFarbe() const
+int DrawableBackground::getVerticalScrollColor() const
 {
-    return vertikalScrollBar ? vertikalScrollBar->getFarbe() : 0;
+    return vertikalScrollBar ? vertikalScrollBar->getColor() : 0;
 }
 
-int DrawableBackground::getVertikalScrollHintergrund() const
+int DrawableBackground::getVerticalScrollBackground() const
 {
-    return vertikalScrollBar ? vertikalScrollBar->getBgFarbe() : 0;
+    return vertikalScrollBar ? vertikalScrollBar->getBgColor() : 0;
 }
 
-int DrawableBackground::getHorizontalKlickScroll() const
+int DrawableBackground::getHorizontalClickScroll() const
 {
-    return horizontalScrollBar ? horizontalScrollBar->getKlickScroll() : 0;
+    return horizontalScrollBar ? horizontalScrollBar->getClickScroll() : 0;
 }
 
 int DrawableBackground::getHorizontalScrollPos() const
@@ -1006,18 +1006,18 @@ int DrawableBackground::getHorizontalScrollPos() const
     return horizontalScrollBar ? horizontalScrollBar->getScroll() : 0;
 }
 
-int DrawableBackground::getHorizontalScrollFarbe() const
+int DrawableBackground::getHorizontalScrollColor() const
 {
-    return horizontalScrollBar ? horizontalScrollBar->getFarbe() : 0;
+    return horizontalScrollBar ? horizontalScrollBar->getColor() : 0;
 }
 
-int DrawableBackground::getHorizontalScrollHintergrund() const
+int DrawableBackground::getHorizontalScrollBackground() const
 {
-    return horizontalScrollBar ? horizontalScrollBar->getBgFarbe() : 0;
+    return horizontalScrollBar ? horizontalScrollBar->getBgColor() : 0;
 }
 
 Drawable*
-DrawableBackground::dublizieren() const // Creates a copy of the drawing
+DrawableBackground::duplicate() const // Creates a copy of the drawing
 {
     DrawableBackground* obj = new DrawableBackground();
     obj->setPosition(pos);
@@ -1026,28 +1026,28 @@ DrawableBackground::dublizieren() const // Creates a copy of the drawing
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setStyle(style);
-    obj->setHintergrundFarbe(hintergrundFarbe);
-    if (hintergrundFeld)
-        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
-    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
-    if (hintergrundImage)
-        obj->setHintergrundImage(
-            dynamic_cast<Image*>(hintergrundImage->getThis()));
+    obj->setBackgroundColor(backgroundColor);
+    if (backgroundFeld)
+        obj->setAlphaFieldZ((AlphaField*)backgroundFeld->duplicate());
+    if (border) obj->setBorderZ((Border*)border->duplicate());
+    if (backgroundImage)
+        obj->setBackgroundImage(
+            dynamic_cast<Image*>(backgroundImage->getThis()));
     if (vertikalScrollBar)
     {
-        obj->setVertikalKlickScroll(vertikalScrollBar->getKlickScroll());
-        obj->setVertikalScrollPos(vertikalScrollBar->getScroll());
-        obj->setVertikalScrollFarbe(
-            vertikalScrollBar->getFarbe(), vertikalScrollBar->getBgFarbe());
+        obj->setVerticalClickScroll(vertikalScrollBar->getClickScroll());
+        obj->setVerticalScrollPos(vertikalScrollBar->getScroll());
+        obj->setVerticalScrollColor(
+            vertikalScrollBar->getColor(), vertikalScrollBar->getBgColor());
     }
     if (horizontalScrollBar)
     {
-        obj->setHorizontalKlickScroll(horizontalScrollBar->getKlickScroll());
+        obj->setHorizontalClickScroll(horizontalScrollBar->getClickScroll());
         obj->setHorizontalScrollPos(horizontalScrollBar->getScroll());
-        obj->setHorizontalScrollFarbe(
-            horizontalScrollBar->getFarbe(), horizontalScrollBar->getBgFarbe());
+        obj->setHorizontalScrollColor(
+            horizontalScrollBar->getColor(), horizontalScrollBar->getBgColor());
     }
     return obj;
 }

Drawing.h

@@ -31,14 +31,14 @@ namespace Framework
         {
         public:
             //! If this style is set, the drawing is displayed when rendered
-            static const __int64 Sichtbar = 0x00001;
+            static const __int64 Visible = 0x00001;
             //! If this style is set, the user can interact with the drawing
-            static const __int64 Erlaubt = 0x00002;
+            static const __int64 Allowed = 0x00002;
             //! If this style is set, keyboard events are processed by the drawing
-            static const __int64 Fokus = 0x00004;
+            static const __int64 Focus = 0x00004;
             //! If this style is set, mouse events are processed even when
             //! the object is not visible
-            static const __int64 MEIgnoreSichtbar = 0x0800000000000000;
+            static const __int64 MEIgnoreVisible = 0x0800000000000000;
             //! If this style is set, the thread locks the object while
             //! the mouse event is being processed
             static const __int64 MELockDrawable = 0x1000000000000000;
@@ -47,34 +47,34 @@ namespace Framework
             static const __int64 MEIgnoreInside = 0x2000000000000000;
             //! If this style is set, mouse events are processed even when
             //! they have already been processed by another drawing
-            static const __int64 MEIgnoreVerarbeitet = 0x4000000000000000;
+            static const __int64 MEIgnoreProcessed = 0x4000000000000000;
             //! If this style is set, mouse events are processed even when
             //! they are outside the drawing to which this drawing belongs
             static const __int64 MEIgnoreParentInside = 0x8000000000000000;
         };
 
     protected:
-        Punkt pos;
-        Punkt gr;
+        Point pos;
+        Point gr;
         void* makParam;
         void* takParam;
-        MausAktion mak;
-        TastaturAktion tak;
+        MouseAction mak;
+        KeyboardAction tak;
         void* nmakParam;
         void* ntakParam;
-        MausAktion nMak;
-        TastaturAktion nTak;
-        bool mausIn;
+        MouseAction nMak;
+        KeyboardAction nTak;
+        bool mouseIn;
         Critical cs;
         ToolTip* toolTip;
         __int64 style;
         bool rend;
-        std::function<bool(Drawable*, Punkt localPos)> onNeedToolTip;
+        std::function<bool(Drawable*, Point localPos)> onNeedToolTip;
         bool toolTipRequested;
 
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The mouse event \param userRet true if
-        //! MouseEvent::verarbeitet should be set to true
+        //! MouseEvent::processed should be set to true
         DLLEXPORT virtual void doMouseEvent(MouseEvent& me, bool userRet);
 
     public:
@@ -95,7 +95,7 @@ namespace Framework
         //! Sets a function called when a tooltip is needed and none has
         //! been set yet \param initToolTip The function
         DLLEXPORT void setNeedToolTipEvent(
-            std::function<bool(Drawable*, Punkt localPos)> onNeedTooltip);
+            std::function<bool(Drawable*, Point localPos)> onNeedTooltip);
         //! Sets the tooltip
         //! \param tt The tooltip
         DLLEXPORT void setToolTipZ(ToolTip* tt);
@@ -118,29 +118,29 @@ namespace Framework
         //! 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 setMouseEvent(MausAktion ak);
+        DLLEXPORT void setMouseEvent(MouseAction 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 addMouseEvent(MausAktion ak);
+        DLLEXPORT void addMouseEvent(MouseAction 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
         //! __ret1TE can be used, 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
+        //! always returns 1. Other standard functions are _onlyNumbersTE and
+        //! _onlyHexTE also from KeyboardEvent.h \param ak A pointer to
         //! the callback function
-        DLLEXPORT void setKeyboardEvent(TastaturAktion ak);
+        DLLEXPORT void setKeyboardEvent(KeyboardAction 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
         //! __ret1TE can be used, 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
+        //! always returns 1. Other standard functions are _onlyNumbersTE and
+        //! _onlyHexTE also from KeyboardEvent.h \param ak A pointer to
         //! the callback function
-        DLLEXPORT void addKeyboardEvent(TastaturAktion ak);
+        DLLEXPORT void addKeyboardEvent(KeyboardAction 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
@@ -155,15 +155,15 @@ namespace Framework
         //! 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 setNMouseEvent(MausAktion ak);
+        DLLEXPORT void setNMouseEvent(MouseAction 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
         //! by any other drawing. The standard function __ret1TE can be used,
         //! which is defined in KeyboardEvent.h and always returns 1. Other
-        //! standard functions are _nurNummernTE and _nurHexTE also from
+        //! standard functions are _onlyNumbersTE and _onlyHexTE also from
         //! KeyboardEvent.h \param ak A pointer to the callback function
-        DLLEXPORT void setNKeyboardEvent(TastaturAktion ak);
+        DLLEXPORT void setNKeyboardEvent(KeyboardAction ak);
         //! Processes a mouse event. Called automatically by the framework.
         //! \param me The event
         DLLEXPORT virtual void doPublicMouseEvent(MouseEvent& me);
@@ -175,7 +175,7 @@ namespace Framework
         DLLEXPORT virtual bool tick(double tickval);
         //! Sets the position of the drawing
         //! \param pos The position in pixels
-        DLLEXPORT void setPosition(const Punkt& pos);
+        DLLEXPORT void setPosition(const Point& pos);
         //! Sets the X position of the drawing
         //! \param xPos The position in pixels
         DLLEXPORT void setX(int xPos);
@@ -184,7 +184,7 @@ namespace Framework
         DLLEXPORT void setY(int yPos);
         //! Sets the size of the drawing
         //! \param gr A point with x as width and y as height in pixels
-        DLLEXPORT void setSize(const Punkt& gr);
+        DLLEXPORT void setSize(const Point& gr);
         //! Sets the position of the drawing
         //! \param x The X position in pixels
         //! \param y The Y position in pixels
@@ -222,16 +222,16 @@ namespace Framework
         //! Returns whether a callback function for keyboard events was set
         DLLEXPORT bool hasKeyboardEvent() const;
         //! Returns the position of the drawing in pixels
-        DLLEXPORT const Punkt& getPosition() const;
+        DLLEXPORT const Point& getPosition() const;
         //! Returns the size of the drawing in pixels. x for width and y
         //! for height
-        DLLEXPORT const Punkt& getSize() const;
+        DLLEXPORT const Point& getSize() const;
         //! Returns the width of the drawing in pixels
-        DLLEXPORT int getBreite() const;
+        DLLEXPORT int getWidth() const;
         //! Returns the height of the drawing in pixels
         DLLEXPORT int getHeight() const;
         //! Returns the inner width of the drawing in pixels
-        DLLEXPORT virtual int getInnenBreite() const;
+        DLLEXPORT virtual int getInnerWidth() const;
         //! Returns the inner height of the drawing in pixels
         DLLEXPORT virtual int getInnenHeight() const;
         //! Returns the X position of the drawing in pixels
@@ -241,12 +241,12 @@ namespace Framework
         //! Checks whether a point is inside this object
         //! \param p The point
         //! \return 1 if the point is inside, 0 otherwise
-        DLLEXPORT virtual bool istPunktInnen(Punkt p) const;
+        DLLEXPORT virtual bool isPointInside(Point p) const;
         //! Checks whether a point is inside this object
         //! \param x The x coordinate of the point
         //! \param y The y coordinate of the point
         //! \return 1 if the point is inside, 0 otherwise
-        DLLEXPORT virtual bool istPunktInnen(int x, int y) const;
+        DLLEXPORT virtual bool isPointInside(int x, int y) const;
         //! Returns a pointer to the tooltip object, if it is used
         DLLEXPORT ToolTip* getToolTip() const;
         //! Returns a pointer to the tooltip object without increased
@@ -255,16 +255,16 @@ namespace Framework
         //! Returns whether specific styles are set
         //! \param style The styles to check
         //! \return 1 if all styles in style are set
-        DLLEXPORT bool hatStyle(__int64 style) const;
+        DLLEXPORT bool hasStyle(__int64 style) const;
         //! Returns whether specific styles are not set
         //! \param style The styles to check
         //! \return 1 if all styles in style are not set
-        DLLEXPORT bool hatStyleNicht(__int64 style) const;
+        DLLEXPORT bool hasStyleNot(__int64 style) const;
         //! returns all currently active styles
         DLLEXPORT __int64 getStyles() const;
         //! Copies the complete drawing so it can be modified without
         //! affecting the original
-        DLLEXPORT virtual Drawable* dublizieren() const;
+        DLLEXPORT virtual Drawable* duplicate() const;
     };
 
     //! A drawing element for the 2D GUI Framework with background, border
@@ -278,12 +278,12 @@ namespace Framework
             //! If this flag is set, the drawing gets a border
             static const __int64 Border = 0x00010;
             //! If this flag is set, the drawing gets a background
-            static const __int64 Hintergrund = 0x00020;
+            static const __int64 Background = 0x00020;
             //! If this flag is set, the background is transparent.
-            //! Requires flag Hintergrund
+            //! Requires flag Background
             static const __int64 HAlpha = 0x00040;
             //! If this flag is set, an image is used as background.
-            //! Requires flag Hintergrund
+            //! Requires flag Background
             static const __int64 HImage = 0x00080;
             //! If this flag is set, a color gradient appears as border
             static const __int64 Buffered = 0x00100;
@@ -296,14 +296,14 @@ namespace Framework
         };
 
     protected:
-        int hintergrundFarbe;
-        Border* rahmen;
-        Image* hintergrundImage;
-        AlphaField* hintergrundFeld;
+        int backgroundColor;
+        Border* border;
+        Image* backgroundImage;
+        AlphaField* backgroundFeld;
         VScrollBar* vertikalScrollBar;
         HScrollBar* horizontalScrollBar;
-        Punkt innenPosition;
-        Punkt innenSize;
+        Point innenPosition;
+        Point innenSize;
 
     protected:
         //! Processes mouse messages
@@ -316,15 +316,15 @@ namespace Framework
         //! Destructor
         DLLEXPORT virtual ~DrawableBackground();
         //! Sets the background image (requires drawing flag:
-        //! Style::Hintergrund, HImage) \param bild The image is copied and used
+        //! Style::Background, HImage) \param bild The image is copied and used
         //! as background image
-        DLLEXPORT void setHintergrundImage(Image* bild);
+        DLLEXPORT void setBackgroundImage(Image* bild);
         //! Sets a pointer to the background image (requires drawing flag:
-        //! Style::Hintergrund) \param bild The image is used without copying
-        DLLEXPORT void setHintergrundImageZ(Image* bild);
+        //! Style::Background) \param bild The image is used without copying
+        DLLEXPORT void setBackgroundImageZ(Image* bild);
         //! Sets the background color (requires drawing flag:
-        //! Style::Hintergrund) \param fc The background color in A8R8G8B8 format
-        DLLEXPORT void setHintergrundFarbe(int fc);
+        //! Style::Background) \param fc The background color in A8R8G8B8 format
+        DLLEXPORT void setBackgroundColor(int fc);
         //! 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);
@@ -348,24 +348,24 @@ namespace Framework
         DLLEXPORT void setBorderColor(int fc);
         //! Sets the scroll speed of the vertical scroll bar (requires drawing
         //! flag: Style::VScroll) \param ks The scroll speed in pixels per mouse click
-        DLLEXPORT void setVertikalKlickScroll(int ks);
+        DLLEXPORT void setVerticalClickScroll(int ks);
         //! Scrolls to a specific position on the vertical scroll bar
         //! (requires drawing flag: Style::VScroll) \param pos The scroll offset in pixels
-        DLLEXPORT void setVertikalScrollPos(int pos);
+        DLLEXPORT void setVerticalScrollPos(int pos);
         //! Sets the color of the vertical scroll bar (requires drawing flag:
         //! Style::VScroll) \param f The foreground color in A8R8G8B8 format
         //! \param bgF The background color in A8R8G8B8 format
-        DLLEXPORT void setVertikalScrollFarbe(int f, int bgF);
+        DLLEXPORT void setVerticalScrollColor(int f, int bgF);
         //! Sets the scroll speed of the horizontal scroll bar (requires drawing
         //! flag: Style::HScroll) \param ks The scroll speed in pixels per mouse click
-        DLLEXPORT void setHorizontalKlickScroll(int ks);
+        DLLEXPORT void setHorizontalClickScroll(int ks);
         //! Scrolls to a specific position on the horizontal scroll bar
         //! (requires drawing flag: Style::HScroll) \param pos The scroll offset in pixels
         DLLEXPORT void setHorizontalScrollPos(int pos);
         //! Sets the color of the horizontal scroll bar (requires drawing flag:
         //! Style::HScroll) \param f The foreground color in A8R8G8B8 format
         //! \param bgF The background color in A8R8G8B8 format
-        DLLEXPORT void setHorizontalScrollFarbe(int f, int bgF);
+        DLLEXPORT void setHorizontalScrollColor(int f, int bgF);
         //! 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
@@ -374,17 +374,17 @@ namespace Framework
         DLLEXPORT void render(Image& rObj) override;
 
         //! Returns the inner width of the drawing in pixels
-        DLLEXPORT virtual int getInnenBreite() const override;
+        DLLEXPORT virtual int getInnerWidth() const override;
         //! Returns the inner height of the drawing in pixels
         DLLEXPORT virtual int getInnenHeight() const override;
         //! Returns the background image.
         //! \return 0 if no background image is used
-        DLLEXPORT Image* getHintergrundImage() const;
+        DLLEXPORT Image* getBackgroundImage() const;
         //! Returns the background image without increased reference counter.
         //! \return 0 if no background image is used
-        DLLEXPORT Image* zHintergrundImage() const;
+        DLLEXPORT Image* zBackgroundImage() const;
         //! Returns the background color in A8R8G8B8 format
-        DLLEXPORT int getHintergrundFarbe() const;
+        DLLEXPORT int getBackgroundColor() const;
         //! Returns the AlphaField drawn over the background.
         //! \return 0 if the AlphaField was not defined
         DLLEXPORT AlphaField* getAlphaField() const;
@@ -406,26 +406,26 @@ namespace Framework
         //! Returns the color of the border in A8R8G8B8 format
         DLLEXPORT int getBorderColor() const;
         //! Returns the scroll speed of the vertical scroll bar
-        DLLEXPORT int getVertikalKlickScroll() const;
+        DLLEXPORT int getVerticalClickScroll() const;
         //! Returns the scroll position of the vertical scroll bar
-        DLLEXPORT int getVertikalScrollPos() const;
+        DLLEXPORT int getVerticalScrollPos() const;
         //! Returns the color of the vertical scroll bar in A8R8G8B8 format
-        DLLEXPORT int getVertikalScrollFarbe() const;
+        DLLEXPORT int getVerticalScrollColor() const;
         //! Returns the background color of the vertical scroll bar in A8R8G8B8
         //! format
-        DLLEXPORT int getVertikalScrollHintergrund() const;
+        DLLEXPORT int getVerticalScrollBackground() const;
         //! Returns the scroll speed of the horizontal scroll bar
-        DLLEXPORT int getHorizontalKlickScroll() const;
+        DLLEXPORT int getHorizontalClickScroll() const;
         //! Returns the scroll position of the horizontal scroll bar
         DLLEXPORT int getHorizontalScrollPos() const;
         //! Returns the color of the horizontal scroll bar in A8R8G8B8 format
-        DLLEXPORT int getHorizontalScrollFarbe() const;
+        DLLEXPORT int getHorizontalScrollColor() const;
         //! Returns the background color of the horizontal scroll bar in A8R8G8B8
         //! format
-        DLLEXPORT int getHorizontalScrollHintergrund() const;
+        DLLEXPORT int getHorizontalScrollBackground() const;
         //! Creates a copy of the drawing that can be modified without
         //! affecting the original
-        DLLEXPORT virtual Drawable* dublizieren() const;
+        DLLEXPORT virtual Drawable* duplicate() const;
     };
 } // namespace Framework
 

Drawing3D.cpp

@@ -126,7 +126,7 @@ void Drawable3D::setSize(float size)
 //  viewProj: The multiplied camera matrices
 //  matBuffer: An array of matrices to be filled
 //  return: The number of matrices the drawing requires
-int Drawable3D::errechneMatrizen(
+int Drawable3D::calculateMatrices(
     const Mat4<float>& viewProj, Mat4<float>* matBuffer)
 {
     matBuffer[0] = viewProj * welt;
@@ -159,7 +159,7 @@ bool Drawable3D::tick(double tickval)
 }
 
 // Returns whether the object contains partially or fully transparent areas
-bool Drawable3D::hatAlpha() const
+bool Drawable3D::hasAlpha() const
 {
     return alpha;
 }

Drawing3D.h

@@ -69,7 +69,7 @@ namespace Framework
         //! \param viewProj The multiplied camera matrices
         //! \param matBuffer An array of matrices to fill
         //! \return The number of matrices the drawing requires
-        DLLEXPORT virtual int errechneMatrizen(
+        DLLEXPORT virtual int calculateMatrices(
             const Mat4<float>& viewProj, Mat4<float>* matBuffer);
         //! Processes a mouse event
         //! \param me The mouse event to process
@@ -82,7 +82,7 @@ namespace Framework
         //! function \return true if the object changed, false otherwise.
         DLLEXPORT virtual bool tick(double tickval);
         //! Returns whether the object contains partially or fully transparent areas
-        DLLEXPORT bool hatAlpha() const;
+        DLLEXPORT bool hasAlpha() const;
         //! Returns the radius of a sphere that encloses the entire model
         DLLEXPORT inline float getRadius() const;
         //! Returns a point representing the position of the drawing in the world

File.cpp

@@ -55,7 +55,7 @@ File::~File()
 // non-constant
 void File::setFile(const char* pfad) // sets the file
 {
-    if (istOffen()) close();
+    if (isOpen()) close();
     if (!this->pfad) this->pfad = new Text();
     this->pfad->setText(pfad);
     gr = 0;
@@ -63,14 +63,14 @@ void File::setFile(const char* pfad) // sets the file
 
 void File::setFile(Text* pfad)
 {
-    if (istOffen()) close();
+    if (isOpen()) close();
     if (!this->pfad) this->pfad = new Text();
     this->pfad->setText(*pfad);
     pfad->release();
     gr = 0;
 }
 
-bool File::umbenennen(const char* pfad) // renames and possibly moves the file
+bool File::rename(const char* pfad) // renames and possibly moves the file
 {
     if (!pfad) return 0;
     if (FileRename(this->pfad->getText(), pfad))
@@ -81,7 +81,7 @@ bool File::umbenennen(const char* pfad) // renames and possibly moves the file
     return 0;
 }
 
-bool File::umbenennen(Text* pfad)
+bool File::rename(Text* pfad)
 {
     if (!this->pfad)
     {
@@ -104,7 +104,7 @@ bool File::remove() // deletes the file
     return FileRemove(dynamic_cast<Text*>(pfad->getThis()));
 }
 
-bool File::erstellen() // creates the file
+bool File::create() // creates the file
 {
     if (!pfad) return 0;
     return FilePathCreate(dynamic_cast<Text*>(pfad->getThis()));
@@ -116,12 +116,12 @@ bool File::open(int style) // opens the file
     if (stream) delete stream;
     stream = new std::fstream();
     std::ios_base::openmode om = std::ios::binary;
-    if ((style | Style::lesen) == style) om |= std::ios::in;
+    if ((style | Style::readAll) == style) om |= std::ios::in;
     if ((style | Style::schreiben) == style) om |= std::ios::out;
     stream->open(pfad->getText(), om);
     if ((style | Style::ende) == style)
     {
-        if ((style | Style::lesen) == style) stream->seekg(0, std::ios::end);
+        if ((style | Style::readAll) == style) stream->seekg(0, std::ios::end);
         if ((style | Style::schreiben) == style)
             stream->seekp(0, std::ios::end);
     }
@@ -162,7 +162,7 @@ void File::setSPosition(__int64 pos, bool ende) // sets the write position
     tmpSBPos = -1;
 }
 
-void File::schreibe(const char* bytes, int len) // writes bytes to file
+void File::write(const char* bytes, int len) // writes bytes to file
 {
     if (!pfad || !stream) return;
     if (tmpSBPos >= 0)
@@ -175,7 +175,7 @@ void File::schreibe(const char* bytes, int len) // writes bytes to file
     {
         key->setPos(getSPosition());
         Bytes* n = new Bytes(bytes, len);
-        key->codieren(dynamic_cast<Bytes*>(n->getThis()));
+        key->encode2(dynamic_cast<Bytes*>(n->getThis()));
         stream->write(n->getBytes(), len);
         n->release();
     }
@@ -189,7 +189,7 @@ void Framework::File::flush()
     stream->flush();
 }
 
-void File::lese(char* bytes, int len) // reads bytes from file
+void File::read(char* bytes, int len) // reads bytes from file
 {
     if (!pfad) return;
     if (stream)
@@ -201,17 +201,17 @@ void File::lese(char* bytes, int len) // reads bytes from file
             key->setPos(tmp);
             Bytes* n = new Bytes();
             n->setBytesZ(bytes, len);
-            key->decodieren(n);
+            key->decode2(n);
         }
     }
     tmpLBPos = 7;
     tmpSBPos = -1;
 }
 
-Text* File::leseZeile() // reads a line
+Text* File::readLine() // reads a line
 {
     if (!pfad || !stream) return 0;
-    if (istEnde()) return 0;
+    if (isEnd()) return 0;
     Text* ret = new Text("");
     __int64 len = getSize();
     for (char c = 0; c != '\n' && stream->tellg() < len;)
@@ -223,7 +223,7 @@ Text* File::leseZeile() // reads a line
             key->setPos(tmp);
             Bytes* n = new Bytes();
             n->setBytesZ(&c, 1);
-            key->decodieren(n);
+            key->decode2(n);
         }
         if (c) ret->append(&c, 1);
     }
@@ -241,7 +241,7 @@ void File::close() // closes the file
         {
             key->setPos(getSPosition());
             Bytes* n = new Bytes(&tmpSByte, 1);
-            key->codieren(dynamic_cast<Bytes*>(n->getThis()));
+            key->encode2(dynamic_cast<Bytes*>(n->getThis()));
             stream->write(n->getBytes(), 1);
             n->release();
         }
@@ -323,7 +323,7 @@ bool File::getNextBit(bool& bit) // read file bit by bit
             key->setPos(tmp);
             Bytes* n = new Bytes();
             n->setBytesZ(&tmpLByte, 1);
-            key->decodieren(n);
+            key->decode2(n);
         }
     }
     tmpLBPos++;
@@ -343,7 +343,7 @@ bool File::setNextBit(bool bit) // write file bit by bit
         {
             key->setPos(getSPosition());
             Bytes* n = new Bytes(&tmpSByte, 1);
-            key->codieren(dynamic_cast<Bytes*>(n->getThis()));
+            key->encode2(dynamic_cast<Bytes*>(n->getThis()));
             stream->write(n->getBytes(), 1);
             n->release();
         }
@@ -369,20 +369,20 @@ void File::setKey(char* s, int l)
 }
 
 // constant
-bool File::istOrdner() const // checks if the file is a directory
+bool File::isDirectory() const // checks if the file is a directory
 {
     if (!pfad) return 0;
     return FileIsDirectory(dynamic_cast<Text*>(pfad->getThis()));
 }
 
-bool File::istOffen() const // checks if the file is open
+bool File::isOpen() const // checks if the file is open
 {
     if (!pfad) return 0;
     if (stream) return stream->is_open() && stream->good();
     return 0;
 }
 
-int File::getUnterdateiAnzahl() const // returns the number of sub-files
+int File::getSubFileCount() const // returns the number of sub-files
 {
 #ifdef WIN32
     if (!pfad) return 0;
@@ -391,8 +391,8 @@ int File::getUnterdateiAnzahl() const // returns the number of sub-files
     HANDLE fHandle;
     WIN32_FIND_DATA wfd;
     Text stxt = pfad->getText();
-    stxt.ersetzen('/', '\\');
-    if (stxt.positionVon('\\') == stxt.getLength() - 1)
+    stxt.replace('/', '\\');
+    if (stxt.positionOf('\\') == stxt.getLength() - 1)
         stxt.append("*");
     else
         stxt.append("\\*");
@@ -407,8 +407,8 @@ int File::getUnterdateiAnzahl() const // returns the number of sub-files
     if (!FileIsDirectory(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     int ret = 0;
     Text stxt = pfad->getText();
-    stxt.ersetzen('\\', '/');
-    if (stxt.positionVon('/') == stxt.getLength() - 1)
+    stxt.replace('\\', '/');
+    if (stxt.positionOf('/') == stxt.getLength() - 1)
         stxt.remove(stxt.getLength() - 1);
     DIR* hdir;
     hdir = opendir(stxt.getText());
@@ -429,8 +429,8 @@ RCArray<Text>* File::getFileList() const // returns a list of sub-files
     HANDLE fHandle;
     WIN32_FIND_DATA wfd;
     Text stxt = pfad->getText();
-    stxt.ersetzen('/', '\\');
-    if (stxt.positionVon('\\') == stxt.getLength() - 1)
+    stxt.replace('/', '\\');
+    if (stxt.positionOf('\\') == stxt.getLength() - 1)
         stxt.append("*");
     else
         stxt.append("\\*");
@@ -450,8 +450,8 @@ RCArray<Text>* File::getFileList() const // returns a list of sub-files
     if (!pfad) return 0;
     if (!FileIsDirectory(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     Text stxt = pfad->getText();
-    stxt.ersetzen('\\', '/');
-    if (stxt.positionVon('/') == stxt.getLength() - 1)
+    stxt.replace('\\', '/');
+    if (stxt.positionOf('/') == stxt.getLength() - 1)
         stxt.remove(stxt.getLength() - 1);
     DIR* hdir;
     hdir = opendir(stxt.getText());
@@ -478,7 +478,7 @@ __int64 File::getSize() const // returns the size of the file
 {
     if (!pfad) return 0;
     if (gr) return gr;
-    if (!stream || !istOffen())
+    if (!stream || !isOpen())
     {
         std::fstream* stream = new std::fstream();
         stream->open(pfad->getText(), std::ios::binary | std::ios::in);
@@ -546,7 +546,7 @@ Time* File::getLastChange() const // returns the date of the last modification
 #endif
 }
 
-bool File::existiert() const // checks if the file exists
+bool File::exists() const // checks if the file exists
 {
     if (!pfad) return 0;
     return FileExists(dynamic_cast<Text*>(pfad->getThis()));
@@ -564,7 +564,7 @@ __int64 File::getSPosition() const // returns the write position
     return stream->tellp();
 }
 
-bool File::istEnde() const // checks if the end of file is reached
+bool File::isEnd() const // checks if the end of file is reached
 {
     if (!stream || stream->tellg() < 0) return 1;
     __int64 i = getSize();
@@ -637,12 +637,12 @@ bool Framework::FilePathCreate(
     Text pf = pfad;
     bool erst = 1;
 #ifdef WIN32
-    pf.ersetzen("//", "\\"); // Correct path separators
-    pf.ersetzen("/", "\\");
-    for (int i = 0; i < pf.anzahlVon("\\");
+    pf.replace("//", "\\"); // Correct path separators
+    pf.replace("/", "\\");
+    for (int i = 0; i < pf.countOf("\\");
         ++i) // Create each directory if it does not exist
     {
-        Text* t = pf.getTeilText(0, pf.positionVon("\\", i));
+        Text* t = pf.getTeilText(0, pf.positionOf("\\", i));
         if (!t || !t->getLength())
         {
             if (t) t->release();
@@ -652,14 +652,14 @@ bool Framework::FilePathCreate(
 #    pragma warning(suppress : 6031)
             _mkdir(t->getText());
         t->release();
-        if (pf.positionVon("\\", i) == pf.getLength() - 1) erst = 0;
+        if (pf.positionOf("\\", i) == pf.getLength() - 1) erst = 0;
     }
 #else
-    pf.ersetzen("\\", "/"); // Correct path separators
-    for (int i = 0; i < pf.anzahlVon("/");
+    pf.replace("\\", "/"); // Correct path separators
+    for (int i = 0; i < pf.countOf("/");
         ++i) // Create each directory if it does not exist
     {
-        Text* t = pf.getTeilText(0, pf.positionVon("/", i));
+        Text* t = pf.getTeilText(0, pf.positionOf("/", i));
         if (!t || !t->getLength())
         {
             if (t) t->release();
@@ -668,7 +668,7 @@ bool Framework::FilePathCreate(
         if (!FileExists(dynamic_cast<Text*>(t->getThis())))
             mkdir(t->getText(), 0777);
         t->release();
-        if (pf.positionVon("\\", i) == pf.getLength() - 1) erst = 0;
+        if (pf.positionOf("\\", i) == pf.getLength() - 1) erst = 0;
     }
 #endif
     if (erst)
@@ -683,7 +683,7 @@ bool Framework::FileRemove(const char* pfad) // Deletes the specified file
 {
     Text pfa = pfad;
 #ifdef WIN32
-    pfa.ersetzen('\\', '/');
+    pfa.replace('\\', '/');
     bool ret = 0;
     // check if file exists
     if (!FileIsDirectory(dynamic_cast<Text*>(pfa.getThis())))
@@ -693,7 +693,7 @@ bool Framework::FileRemove(const char* pfad) // Deletes the specified file
         ret = 1;
         File* dat = new File();
         dat->setFile(dynamic_cast<Text*>(pfa.getThis()));
-        int anz = dat->getUnterdateiAnzahl();
+        int anz = dat->getSubFileCount();
         RCArray<Text>* liste = dat->getFileList();
         for (int i = 0; i < anz; ++i)
         {
@@ -714,7 +714,7 @@ bool Framework::FileRemove(const char* pfad) // Deletes the specified file
     }
     return ret;
 #else
-    pfa.ersetzen('\\', '/');
+    pfa.replace('\\', '/');
     bool ret = 0;
     // check if file exists
     if (!FileIsDirectory(dynamic_cast<Text*>(pfa.getThis())))
@@ -724,7 +724,7 @@ bool Framework::FileRemove(const char* pfad) // Deletes the specified file
         ret = 1;
         File* dat = new File();
         dat->setFile(dynamic_cast<Text*>(pfa.getThis()));
-        int anz = dat->getUnterdateiAnzahl();
+        int anz = dat->getSubFileCount();
         RCArray<Text>* liste = dat->getFileList();
         for (int i = 0; i < anz; ++i)
         {

File.h

@@ -27,7 +27,7 @@ namespace Framework
         class Style
         {
         public:
-            static const int lesen = 0x01; //! file is opened for reading
+            static const int readAll = 0x01; //! file is opened for reading
             static const int schreiben
                 = 0x02; //! file is opened for writing
             static const int ende
@@ -63,19 +63,19 @@ namespace Framework
         //! \param pfad 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 umbenennen(const char* pfad);
+        DLLEXPORT bool rename(const char* pfad);
         //! Renames or moves the file
         //! \param pfad 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 umbenennen(Text* pfad);
+        DLLEXPORT bool rename(Text* pfad);
         //! Deletes the file
         //! \return 1 if the deletion was successful. 0 otherwise
         DLLEXPORT bool remove();
         //! Creates the file anew. If the path contains folders that don't
         //! exist, they will be created
         //!  return 1 if the creation was successful. 0 otherwise
-        DLLEXPORT bool erstellen();
+        DLLEXPORT bool create();
         //! Opens the file
         //! \param style Specifies whether the file is opened for reading and/or
         //! writing. All elements from File::Style:: are possible
@@ -94,16 +94,16 @@ namespace Framework
         //! Writes to the file
         //! \param bytes An array of bytes to be written
         //! \param len How many bytes should be written to the file
-        DLLEXPORT void schreibe(const char* bytes, int len) override;
+        DLLEXPORT void write(const char* bytes, int len) override;
         //! Writes all temporary bytes to the file
         DLLEXPORT void flush();
         //! Reads from the file
         //! \param bytes An array to be filled with bytes from the file
         //! \param len How many bytes should be read from the file
-        DLLEXPORT void lese(char* bytes, int len) override;
+        DLLEXPORT void read(char* bytes, int len) override;
         //! Reads the next line of the file
         //! \return The read line as Text with line break
-        DLLEXPORT Text* leseZeile() override;
+        DLLEXPORT Text* readLine() override;
         //! Closes the file
         DLLEXPORT void close();
         //! Sets the encryption key for the file
@@ -124,14 +124,14 @@ namespace Framework
         DLLEXPORT bool setNextBit(bool bit);
         //! Checks whether the file is a directory
         //!  return 1 if the file is a directory. 0 otherwise
-        DLLEXPORT bool istOrdner() const;
+        DLLEXPORT bool isDirectory() const;
         //! Checks whether the file has been opened
         //! \return 1 if the file is open. 0 otherwise
-        DLLEXPORT bool istOffen() const;
+        DLLEXPORT bool isOpen() const;
         //! Returns the number of sub-files in the directory
         //! \return 0 if the file is not a directory. Otherwise the number
         //! of sub-files
-        DLLEXPORT int getUnterdateiAnzahl() const;
+        DLLEXPORT int getSubFileCount() const;
         //! Returns a list of sub-files
         //!  return 0 if the file is not a directory. A list with the
         //!  names of the sub-files
@@ -146,7 +146,7 @@ namespace Framework
         DLLEXPORT Time* getLastChange() const;
         //! Checks whether the file exists
         //! \return 1 if the file exists. 0 otherwise
-        DLLEXPORT bool existiert() const;
+        DLLEXPORT bool exists() const;
         //! Returns the index of the byte from the file that would be read next
         //! return -1 if an error occurred.
         //! Otherwise the position of the read pointer
@@ -157,7 +157,7 @@ namespace Framework
         DLLEXPORT __int64 getSPosition() const override;
         //! Checks whether the file has been fully read
         //!  return 1 if the file has been fully read. 0 otherwise
-        DLLEXPORT bool istEnde() const override;
+        DLLEXPORT bool isEnd() const override;
         //! Returns the path to the file
         DLLEXPORT Text* getPfad() const;
         //! Returns the path to the file without increasing the reference counter

FileDialog.cpp

@@ -34,8 +34,8 @@ FileDialog::~FileDialog()
 // non-constant
 void FileDialog::removeFileTypes()
 {
-    typeName->leeren();
-    type->leeren();
+    typeName->clear();
+    type->clear();
 }
 
 void FileDialog::addFileType(const char* name, const char* typ)
@@ -55,7 +55,7 @@ void FileDialog::setFileTypeSelection(int i)
 }
 
 // constant
-Text* FileDialog::anzeigen(bool open) const
+Text* FileDialog::show(bool open) const
 {
     IFileDialog* pfd = NULL;
     CoInitialize(NULL);
@@ -120,10 +120,10 @@ Text* FileDialog::anzeigen(bool open) const
                         Text txt = "";
                         for (int i = 0; i < anz; i++)
                         {
-                            if (!type->z(i)->hat(".*"))
+                            if (!type->z(i)->has(".*"))
                             {
                                 Text* tmp = type->z(i)->getTeilText(
-                                    type->z(i)->positionVon(".") + 1);
+                                    type->z(i)->positionOf(".") + 1);
                                 txt.append(*tmp);
                                 tmp->release();
                                 txt += ";";
@@ -201,7 +201,7 @@ FileDialogTh::FileDialogTh()
 // Destructor
 FileDialogTh::~FileDialogTh()
 {
-    warteAufThread(5000);
+    waitForThread(5000);
     if (run) ende();
     dialog->release();
     if (ret) ret->release();
@@ -236,7 +236,7 @@ void FileDialogTh::setFileTypeSelection(int i)
 void FileDialogTh::thread()
 {
     if (ret) ret = (Text*)ret->release();
-    ret = dialog->anzeigen(open);
+    ret = dialog->show(open);
 }
 
 // constant

FileDialog.h

@@ -40,7 +40,7 @@ namespace Framework
         //! 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
-        DLLEXPORT Text* anzeigen(bool open) const;
+        DLLEXPORT Text* show(bool open) const;
     };
 
     //! Manages a file open/save dialog without blocking

FileSystem.cpp

@@ -51,7 +51,7 @@ LTDBPixel::~LTDBPixel()
 }
 
 // non-constant
-bool LTDBPixel::addBitZuFarbe(
+bool LTDBPixel::addBitZuColor(
     unsigned char bit) // Adds a bit to the color values
 {
     if (changeR && iR != miR) // The bit belongs to Red
@@ -134,7 +134,7 @@ char LTDBPixel::addByte(
                 changeR = (bool)((byte >> (7 - i)) & 0x1);
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         (unsigned char)(byte >> (7 - i)))) // The bit belongs to
                                                            // the color
                     return (unsigned char)i;
@@ -146,7 +146,7 @@ char LTDBPixel::addByte(
                 changeG = (bool)((byte >> (7 - i)) & 0x1);
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         (unsigned char)(byte >> (7 - i)))) // The bit belongs to
                                                            // the color
                     return (unsigned char)i;
@@ -158,7 +158,7 @@ char LTDBPixel::addByte(
                 changeB = (bool)((byte >> (7 - i)) & 0x1);
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         (unsigned char)(byte >> (7 - i)))) // The bit belongs to
                                                            // the color
                     return (unsigned char)i;
@@ -170,7 +170,7 @@ char LTDBPixel::addByte(
                 changeA = (bool)((byte >> (7 - i)) & 0x1);
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         (unsigned char)(byte >> (7 - i)))) // The bit belongs to
                                                            // the color
                     return (unsigned char)i;
@@ -186,7 +186,7 @@ char LTDBPixel::addByte(
                      & 7;
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         (unsigned char)(byte >> (7 - i)))) // The bit belongs to
                                                            // the color
                     return (unsigned char)i;
@@ -202,7 +202,7 @@ char LTDBPixel::addByte(
                      & 7;
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         (unsigned char)(byte >> (7 - i)))) // The bit belongs to
                                                            // the color
                     return (unsigned char)i;
@@ -228,14 +228,14 @@ char LTDBPixel::addByte(
             }
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         (unsigned char)(byte >> (7 - i)))) // The bit belongs to
                                                            // the color
                     return (unsigned char)i;
             }
             break;
         default: // The remaining bits all store the color values of the pixel
-            if (!addBitZuFarbe((
+            if (!addBitZuColor((
                     unsigned char)(byte
                                    >> (7 - i)))) // The bit belongs to the color
                 return (unsigned char)i;
@@ -258,7 +258,7 @@ char LTDBPixel::addByte(
     return -1;
 }
 
-void LTDBPixel::setFarbe(int f) // sets the color of the pixel
+void LTDBPixel::setColor(int f) // sets the color of the pixel
 { // Since this function is called, the class is now to be used for saving
     // Reset values in case the class was already used for loading or saving
     index = 0, maxIndex = 1;
@@ -272,7 +272,7 @@ void LTDBPixel::setFarbe(int f) // sets the color of the pixel
     A = (unsigned char)(f >> 24);
 }
 
-void LTDBPixel::komprimieren() // Compresses the pixel
+void LTDBPixel::compress() // Compresses the pixel
 {
     maxIndex = 1;
     if (!davor)
@@ -325,7 +325,7 @@ void LTDBPixel::komprimieren() // Compresses the pixel
     }
 }
 
-bool LTDBPixel::getNextFarbeBit(
+bool LTDBPixel::getNextColorBit(
     char& byte, int i) // Stores the next color bit in byte
 {
     unsigned char RR = R;
@@ -385,7 +385,7 @@ char LTDBPixel::getNextByte(
                 byte |= (char)(((int)changeR & 0x1) << (7 - i));
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return (char)i;
+                if (!getNextColorBit(byte, i)) return (char)i;
             }
             break;
         case 2: // The third bit of the pixel stores either the color
@@ -394,7 +394,7 @@ char LTDBPixel::getNextByte(
                 byte |= (char)(((int)changeG & 0x1) << (7 - i));
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return (char)i;
+                if (!getNextColorBit(byte, i)) return (char)i;
             }
             break;
         case 3: // The fourth bit of the pixel stores either the color
@@ -403,7 +403,7 @@ char LTDBPixel::getNextByte(
                 byte |= (char)(((int)changeB & 0x1) << (7 - i));
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return (char)i;
+                if (!getNextColorBit(byte, i)) return (char)i;
             }
             break;
         case 4: // The fifth bit of the pixel stores either the color
@@ -412,7 +412,7 @@ char LTDBPixel::getNextByte(
                 byte |= (char)(((int)changeA & 0x1) << (7 - i));
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return (char)i;
+                if (!getNextColorBit(byte, i)) return (char)i;
             }
             break;
         case 5: // The sixth bit of the pixel stores either the color
@@ -421,7 +421,7 @@ char LTDBPixel::getNextByte(
                 byte |= (char)(((komp >> 2) & 0x1) << (7 - i));
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return (char)i;
+                if (!getNextColorBit(byte, i)) return (char)i;
             }
             break;
         case 6: // The seventh bit of the pixel stores either the color
@@ -430,7 +430,7 @@ char LTDBPixel::getNextByte(
                 byte |= (char)(((komp >> 1) & 0x1) << (7 - i));
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return (char)i;
+                if (!getNextColorBit(byte, i)) return (char)i;
             }
             break;
         case 7: // The eighth bit of the pixel stores either the color
@@ -439,11 +439,11 @@ char LTDBPixel::getNextByte(
                 byte |= (char)((komp & 0x1) << (7 - i));
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return (char)i;
+                if (!getNextColorBit(byte, i)) return (char)i;
             }
             break;
         default: // The remaining bits store the color of the pixel
-            if (!getNextFarbeBit(byte, i)) return (char)i;
+            if (!getNextColorBit(byte, i)) return (char)i;
             break;
         }
         ++index;
@@ -457,7 +457,7 @@ char LTDBPixel::getNextByte(
 }
 
 // constant
-int LTDBPixel::zuFarbe() const // returns the pixel as color
+int LTDBPixel::toColor() const // returns the pixel as color
 {
     return (((int)R << 16) | ((int)G << 8) | (int)B | ((int)A << 24));
 }
@@ -513,7 +513,7 @@ LTDBFileHeader::LTDBFileHeader()
     : ReferenceCounter(),
       bilder(new RCArray<Text>()),
       pos(new Array<__int64>()),
-      bAnzahl(0)
+      bCount(0)
 {}
 
 // Destructor
@@ -526,19 +526,19 @@ LTDBFileHeader::~LTDBFileHeader()
 // non-constant
 void LTDBFileHeader::removeImage(int i)
 {
-    if (i >= bAnzahl) return;
+    if (i >= bCount) return;
     bilder->remove(i);
     pos->remove(i);
-    --bAnzahl;
+    --bCount;
 }
 
 void LTDBFileHeader::removeImage(Text* txt)
 {
     int i = -1;
-    for (int ii = 0; ii < bAnzahl; ++ii)
+    for (int ii = 0; ii < bCount; ++ii)
     {
         Text* b = bilder->z(ii);
-        if (b->istGleich(txt->getText()))
+        if (b->isEqual(txt->getText()))
         {
             i = ii;
             break;
@@ -548,14 +548,14 @@ void LTDBFileHeader::removeImage(Text* txt)
     if (i == -1) return;
     bilder->remove(i);
     pos->remove(i);
-    --bAnzahl;
+    --bCount;
 }
 
 void LTDBFileHeader::addImage(Text* txt)
 {
-    bilder->add(txt, bAnzahl);
-    pos->add(0, bAnzahl);
-    ++bAnzahl;
+    bilder->add(txt, bCount);
+    pos->add(0, bCount);
+    ++bCount;
 }
 
 void LTDBFileHeader::setImagePos(int i, __int64 pos)
@@ -566,10 +566,10 @@ void LTDBFileHeader::setImagePos(int i, __int64 pos)
 void LTDBFileHeader::setImagePos(Text* txt, __int64 pos)
 {
     int i = -1;
-    for (int ii = 0; ii < bAnzahl; ++ii)
+    for (int ii = 0; ii < bCount; ++ii)
     {
         Text* b = bilder->z(ii);
-        if (b->istGleich(txt->getText()))
+        if (b->isEqual(txt->getText()))
         {
             i = ii;
             break;
@@ -580,30 +580,30 @@ void LTDBFileHeader::setImagePos(Text* txt, __int64 pos)
     this->pos->set(pos, i);
 }
 
-void LTDBFileHeader::laden(ProgressBar* f, std::ifstream* inF)
+void LTDBFileHeader::load(ProgressBar* f, std::ifstream* inF)
 {
     if (inF->is_open() && inF->good())
     {
         char b = 0;
         inF->read(&b, 1);
-        bAnzahl = b << 8;
+        bCount = b << 8;
         inF->read(&b, 1);
-        bAnzahl |= b & 0xFF;
+        bCount |= b & 0xFF;
 #ifdef WIN32
         if (f)
         {
             f->reset();
-            f->setAktionAnzahl(bAnzahl);
+            f->setActionCount(bCount);
         }
 #endif
-        bilder->leeren();
-        pos->leeren();
-        for (int i = 0; i < bAnzahl; ++i)
+        bilder->clear();
+        pos->clear();
+        for (int i = 0; i < bCount; ++i)
         {
             LTDBHeader* kpf = new LTDBHeader();
-            kpf->laden(inF);              // image name and half file position
+            kpf->load(inF);              // image name and half file position
             bilder->add(kpf->getTitel()); // sets title
-            Punkt gr = kpf->getSize();
+            Point gr = kpf->getSize();
             kpf->release();
             char p[5];
             inF->read((char*)p, 5); // other half of the file position
@@ -616,28 +616,28 @@ void LTDBFileHeader::laden(ProgressBar* f, std::ifstream* inF)
                 | (((__int64)p[3] << 8) & 0xFF00) | ((__int64)p[4] & 0xFF);
             pos->add(position, i); // sets position
 #ifdef WIN32
-            if (f) f->aktionPlus();
+            if (f) f->actionPlus();
 #endif
         }
     }
 }
 
 // constant
-void LTDBFileHeader::speichern(std::ofstream* outF) const
+void LTDBFileHeader::save(std::ofstream* outF) const
 {
     if (outF->is_open() && outF->good())
     {
-        char b = (char)(bAnzahl >> 8);
+        char b = (char)(bCount >> 8);
         outF->write(&b, 1);
-        b = (char)bAnzahl;
+        b = (char)bCount;
         outF->write(&b, 1);
-        for (int i = 0; i < bAnzahl; ++i)
+        for (int i = 0; i < bCount; ++i)
         {
             LTDBHeader* kpf = new LTDBHeader();
             __int64 position = pos->get(i);
             kpf->Init(bilder->get(i),
-                Punkt((int)(position >> 52), (int)(position >> 40)));
-            kpf->speichern(outF);
+                Point((int)(position >> 52), (int)(position >> 40)));
+            kpf->save(outF);
             kpf->release();
             char p[] = {(char)(position >> 32),
                 (char)(position >> 24),
@@ -662,10 +662,10 @@ Text* LTDBFileHeader::zImage(int i) const
 __int64 LTDBFileHeader::getImagePosition(Text* txt) const
 {
     int i = -1;
-    for (int ii = 0; ii < bAnzahl; ++ii)
+    for (int ii = 0; ii < bCount; ++ii)
     {
         Text* b = bilder->z(ii);
-        if (b->istGleich(txt->getText()))
+        if (b->isEqual(txt->getText()))
         {
             i = ii;
             break;
@@ -684,10 +684,10 @@ __int64 LTDBFileHeader::getImagePosition(int index) const
 int LTDBFileHeader::getImageIndex(Text* txt) const
 {
     int i = -1;
-    for (int ii = 0; ii < bAnzahl; ++ii)
+    for (int ii = 0; ii < bCount; ++ii)
     {
         Text* b = bilder->z(ii);
-        if (b->istGleich(txt->getText()))
+        if (b->isEqual(txt->getText()))
         {
             i = ii;
             break;
@@ -697,9 +697,9 @@ int LTDBFileHeader::getImageIndex(Text* txt) const
     return i;
 }
 
-int LTDBFileHeader::getbAnzahl() const
+int LTDBFileHeader::getBCount() const
 {
-    return bAnzahl;
+    return bCount;
 }
 
 RCArray<Text>* LTDBFileHeader::zImageListe() const
@@ -714,7 +714,7 @@ LTDBHeader::LTDBHeader()
 {}
 
 // non-constant
-void LTDBHeader::laden(std::ifstream* f) // Loads data from a file
+void LTDBHeader::load(std::ifstream* f) // Loads data from a file
 {
     if (f->is_open())
     {
@@ -724,10 +724,10 @@ void LTDBHeader::laden(std::ifstream* f) // Loads data from a file
         char aa = 0;
         f->read(&aa, 1);
         int tl = (aa >> 4) & Bits(4);
-        int BitAnzahl = 4 + tl * 5 + 24;
+        int BitCount = 4 + tl * 5 + 24;
         f->seekg(-1, std::ios::cur);
-        int Bytes = BitAnzahl / 8;
-        if (((float)BitAnzahl / 8.0f) != (float)Bytes) ++Bytes;
+        int Bytes = BitCount / 8;
+        if (((float)BitCount / 8.0f) != (float)Bytes) ++Bytes;
         char byte = 0;
         for (int i = 0; i < Bytes; ++i)
         {
@@ -737,35 +737,35 @@ void LTDBHeader::laden(std::ifstream* f) // Loads data from a file
     }
 }
 
-int LTDBHeader::Init(Text* t, const Punkt& g) // Fills the data
+int LTDBHeader::Init(Text* t, const Point& g) // Fills the data
 {
     a = 0;
     b = 0;
     c = 0;
     int tl = t->getLength();
     if (tl > 15) tl = 15;
-    char* titel = new char[tl];
+    char* title = new char[tl];
     int skipped = 0;
     for (int i = 0; i < tl; ++i)
     {
-        titel[i - skipped] = t->getText()[i];
-        if (titel[i - skipped] > 96 && titel[i - skipped] < 123)
-            titel[i - skipped] = (char)(titel[i - skipped] - 96);
-        else if (titel[i - skipped] > 64 && titel[i - skipped] < 91)
-            titel[i - skipped] = (char)(titel[i - skipped] - 64);
-        else if (titel[i - skipped] == SpecialCharacters::SMALL_UE
-                 || titel[i - skipped] == SpecialCharacters::BIG_UE)
-            titel[i - skipped] = 27;
-        else if (titel[i - skipped] == SpecialCharacters::SMALL_OE
-                 || titel[i - skipped] == SpecialCharacters::BIG_OE)
-            titel[i - skipped] = 28;
-        else if (titel[i - skipped] == SpecialCharacters::SMALL_AE
-                 || titel[i - skipped] == SpecialCharacters::BIG_AE)
-            titel[i - skipped] = 29;
-        else if (titel[i - skipped] == SpecialCharacters::SZ)
-            titel[i - skipped] = 30;
-        else if (titel[i - skipped] == '.')
-            titel[i - skipped] = 31;
+        title[i - skipped] = t->getText()[i];
+        if (title[i - skipped] > 96 && title[i - skipped] < 123)
+            title[i - skipped] = (char)(title[i - skipped] - 96);
+        else if (title[i - skipped] > 64 && title[i - skipped] < 91)
+            title[i - skipped] = (char)(title[i - skipped] - 64);
+        else if (title[i - skipped] == SpecialCharacters::SMALL_UE
+                 || title[i - skipped] == SpecialCharacters::BIG_UE)
+            title[i - skipped] = 27;
+        else if (title[i - skipped] == SpecialCharacters::SMALL_OE
+                 || title[i - skipped] == SpecialCharacters::BIG_OE)
+            title[i - skipped] = 28;
+        else if (title[i - skipped] == SpecialCharacters::SMALL_AE
+                 || title[i - skipped] == SpecialCharacters::BIG_AE)
+            title[i - skipped] = 29;
+        else if (title[i - skipped] == SpecialCharacters::SZ)
+            title[i - skipped] = 30;
+        else if (title[i - skipped] == '.')
+            title[i - skipped] = 31;
         else
             ++skipped;
     }
@@ -777,53 +777,53 @@ int LTDBHeader::Init(Text* t, const Punkt& g) // Fills the data
         switch (i)
         {
         case 0:
-            a |= (__int64)(titel[i] & 31) << 55; // store 1st character
+            a |= (__int64)(title[i] & 31) << 55; // store 1st character
             break;
         case 1:
-            a |= (__int64)(titel[i] & 31) << 50; // store 2nd character
+            a |= (__int64)(title[i] & 31) << 50; // store 2nd character
             break;
         case 2:
-            a |= (__int64)(titel[i] & 31) << 45; // store 3rd character
+            a |= (__int64)(title[i] & 31) << 45; // store 3rd character
             break;
         case 3:
-            a |= (__int64)(titel[i] & 31) << 40; // store 4th character
+            a |= (__int64)(title[i] & 31) << 40; // store 4th character
             break;
         case 4:
-            a |= (__int64)(titel[i] & 31)
+            a |= (__int64)(title[i] & 31)
               << 35; // store 5th character
             break;
         case 5:
-            a |= (__int64)(titel[i] & 31)
+            a |= (__int64)(title[i] & 31)
               << 30; // store 6th character
             break;
         case 6:
-            a |= (__int64)(titel[i] & 31) << 25; // store 7th character
+            a |= (__int64)(title[i] & 31) << 25; // store 7th character
             break;
         case 7:
-            a |= (__int64)(titel[i] & 31) << 20; // store 8th character
+            a |= (__int64)(title[i] & 31) << 20; // store 8th character
             break;
         case 8:
-            a |= (__int64)(titel[i] & 31) << 15; // store 9th character
+            a |= (__int64)(title[i] & 31) << 15; // store 9th character
             break;
         case 9:
-            a |= (__int64)(titel[i] & 31) << 10; // store 10th character
+            a |= (__int64)(title[i] & 31) << 10; // store 10th character
             break;
         case 10:
-            a |= (__int64)(titel[i] & 31) << 5; // store 11th character
+            a |= (__int64)(title[i] & 31) << 5; // store 11th character
             break;
         case 11:
-            a |= (__int64)(titel[i] & 31); // store 12th character
+            a |= (__int64)(title[i] & 31); // store 12th character
             break;
         case 12:
-            b |= (__int32)(titel[i] & 31)
+            b |= (__int32)(title[i] & 31)
               << 27; // store 13th character
             break;
         case 13:
-            b |= (__int32)(titel[i] & 31)
+            b |= (__int32)(title[i] & 31)
               << 22; // store 14th character
             break;
         case 14:
-            b |= (__int32)(titel[i] & 31)
+            b |= (__int32)(title[i] & 31)
               << 17; // store 15th character
             break;
         }
@@ -834,7 +834,7 @@ int LTDBHeader::Init(Text* t, const Punkt& g) // Fills the data
     setBits(BeginBit, EndBit - 12, grx);
     setBits(BeginBit + 12, EndBit, gry);
     t->release();
-    delete[] titel;
+    delete[] title;
     return skipped;
 }
 
@@ -881,7 +881,7 @@ void LTDBHeader::setBits(int BeginBit, int EndBit, __int16 bits)
 }
 
 // constant
-void LTDBHeader::speichern(
+void LTDBHeader::save(
     std::ofstream* f) const // Saves data to a file
 {
     if (f->is_open())
@@ -979,13 +979,13 @@ Text* LTDBHeader::getTitel() const // returns the name of the image
     return ret;
 }
 
-Punkt LTDBHeader::getSize() const // returns the size of the image
+Point LTDBHeader::getSize() const // returns the size of the image
 {
     int BeginBit = 4 /*title length*/ + getTitelLength() * 5 /*title*/;
     int EndBit = BeginBit + 24;
     __int16 grx = getBits(BeginBit, EndBit - 12);
     __int16 gry = getBits(BeginBit + 12, EndBit);
-    return Punkt((int)(grx & Bits(12)), (int)(gry & Bits(12)));
+    return Point((int)(grx & Bits(12)), (int)(gry & Bits(12)));
 }
 
 __int16 LTDBHeader::getBits(int begin,
@@ -1073,11 +1073,11 @@ void LTDBBody::init(LTDBHeader* k) // Initializes, required before loading
     k->release();
 }
 
-void LTDBBody::laden(ProgressBar* zF, std::ifstream* inF) // loads the image
+void LTDBBody::load(ProgressBar* zF, std::ifstream* inF) // loads the image
 {
-    b->neuImage(gr.x, gr.y, 0xFF000000); // create new image
+    b->newImage(gr.x, gr.y, 0xFF000000); // create new image
     int* buff = b->getBuffer();
-    int breite = b->getBreite();
+    int Width = b->getWidth();
     char byte = 0;
     int index = 0;
     LTDBPixel* davor = 0;                 // last loaded pixel
@@ -1087,7 +1087,7 @@ void LTDBBody::laden(ProgressBar* zF, std::ifstream* inF) // loads the image
     if (zF)
     {
         zF->reset();
-        zF->setAktionAnzahl(gr.x * gr.y);
+        zF->setActionCount(gr.x * gr.y);
     }
 #endif
     while (index < gr.x * gr.y) // for each pixel
@@ -1103,13 +1103,13 @@ void LTDBBody::laden(ProgressBar* zF, std::ifstream* inF) // loads the image
         }
         begin = ende;
         if (begin == 8) begin = 0;
-        buff[(index % gr.x) + (index / gr.x) * breite] = dieser->zuFarbe();
+        buff[(index % gr.x) + (index / gr.x) * Width] = dieser->toColor();
         if (davor) davor = (LTDBPixel*)davor->release();
         davor = dynamic_cast<LTDBPixel*>(dieser->getThis());
         dieser = (LTDBPixel*)dieser->release();
         ++index;
 #ifdef WIN32
-        if (zF) zF->aktionPlus();
+        if (zF) zF->actionPlus();
 #endif
     }
     if (davor) davor = (LTDBPixel*)davor->release();
@@ -1122,7 +1122,7 @@ void LTDBBody::setImage(Image* b) // sets the image to be saved
 }
 
 // constant
-void LTDBBody::speichern(
+void LTDBBody::save(
     ProgressBar* zF, std::ofstream* outF) const // saves image
 {
     if (outF->is_open())
@@ -1138,7 +1138,7 @@ void LTDBBody::speichern(
         if (zF)
         {
             zF->reset();
-            zF->setAktionAnzahl(gr.x * gr.y);
+            zF->setActionCount(gr.x * gr.y);
         }
 #endif
         int* pBuff = b->getBuffer();
@@ -1147,8 +1147,8 @@ void LTDBBody::speichern(
             if (!dieser) // if it is not the first pixel
                 dieser = new LTDBPixel(
                     dynamic_cast<LTDBPixel*>(letzter->getThis()));
-            dieser->setFarbe(pBuff[i]); // set pixel color
-            dieser->komprimieren();     // compress pixel
+            dieser->setColor(pBuff[i]); // set pixel color
+            dieser->compress();     // compress pixel
             ende = -1;
             while (ende < 0) // fill byte
             {
@@ -1169,7 +1169,7 @@ void LTDBBody::speichern(
                 dieser->getThis()); // dieser becomes letzter
             dieser = (LTDBPixel*)dieser->release();
 #ifdef WIN32
-            if (zF) zF->aktionPlus();
+            if (zF) zF->actionPlus();
 #endif
         }
         if (letzter) letzter = (LTDBPixel*)letzter->release();
@@ -1186,7 +1186,7 @@ Image* LTDBBody::getImage() const // returns the loaded image
     return dynamic_cast<Image*>(b->getThis());
 }
 
-const Punkt& LTDBBody::getSize() const // returns the size of the image
+const Point& LTDBBody::getSize() const // returns the size of the image
 {
     return gr;
 }
@@ -1215,7 +1215,7 @@ void LTDBFile::setFile(Text* pfad) // Sets the path to the file
     pfad->release();
 }
 
-void LTDBFile::erstellen() // Creates the file
+void LTDBFile::create() // Creates the file
 {
     FilePathCreate(dynamic_cast<Text*>(pfad->getThis()));
     std::ofstream* outF = new std::ofstream(pfad->getText(), std::ios::binary);
@@ -1224,7 +1224,7 @@ void LTDBFile::erstellen() // Creates the file
     delete outF;
 }
 
-void LTDBFile::leseDaten(
+void LTDBFile::readData(
     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
@@ -1235,7 +1235,7 @@ void LTDBFile::leseDaten(
         datKpf = new LTDBFileHeader();
         std::ifstream* inF
             = new std::ifstream(pfad->getText(), std::ios::binary);
-        datKpf->laden(f, inF);
+        datKpf->load(f, inF);
         delete inF;
     }
 }
@@ -1253,7 +1253,7 @@ void LTDBFile::remove(ProgressBar* f, Text* name) // Deletes an image from the f
 {
     if (FileExists(dynamic_cast<Text*>(pfad->getThis())) && name)
     {
-        if (!datKpf) leseDaten(0); // read data
+        if (!datKpf) readData(0); // read data
         // Check if file is not present
         if (!datKpf)
         {
@@ -1275,8 +1275,8 @@ void LTDBFile::remove(ProgressBar* f, Text* name) // Deletes an image from the f
         {
             c = (char)('0' + (i % 10));
             if ((i % 10) == 0) pf_tmp->append("$");
-            pf_tmp->ersetzen(
-                pf_tmp->anzahlVon((char)('0' - ((i - 1) % 10))) - 1,
+            pf_tmp->replace(
+                pf_tmp->countOf((char)('0' - ((i - 1) % 10))) - 1,
                 (char)('0' - ((i - 1) % 10)),
                 c);
         }
@@ -1291,9 +1291,9 @@ void LTDBFile::remove(ProgressBar* f, Text* name) // Deletes an image from the f
         {
             __int64 position = datKpf->getImagePosition(index);
             datKpf->removeImage(index);
-            datKpf->speichern(outF);
+            datKpf->save(outF);
             LTDBFileHeader* kpf_tmp = new LTDBFileHeader();
-            kpf_tmp->laden(0, inF);
+            kpf_tmp->load(0, inF);
             kpf_tmp->release();
             char byte = 0;
             __int64 pos_minus = inF->tellg() - outF->tellp();
@@ -1306,10 +1306,10 @@ void LTDBFile::remove(ProgressBar* f, Text* name) // Deletes an image from the f
                 outF->write(&byte, 1);
             } // skip image to be deleted
             LTDBHeader* delkpf = new LTDBHeader();
-            delkpf->laden(inF);
+            delkpf->load(inF);
             LTDBBody* delkpr
                 = new LTDBBody(dynamic_cast<LTDBHeader*>(delkpf->getThis()));
-            delkpr->laden(f, inF);
+            delkpr->load(f, inF);
             delkpf = (LTDBHeader*)delkpf->release();
             delkpr = (LTDBBody*)delkpr->release(); // copy remaining bytes
             pos_minus = inF->tellg() - outF->tellp();
@@ -1318,10 +1318,10 @@ void LTDBFile::remove(ProgressBar* f, Text* name) // Deletes an image from the f
                 inF->read(&byte, 1);
                 outF->write(&byte, 1);
             }
-            for (int i = index; i < datKpf->getbAnzahl(); ++i)
+            for (int i = index; i < datKpf->getBCount(); ++i)
                 datKpf->setImagePos(i, datKpf->getImagePosition(i) - pos_minus);
             outF->seekp(0, std::ios::beg);
-            datKpf->speichern(outF);
+            datKpf->save(outF);
             inF->close();
             outF->close();
             FileRemove(dynamic_cast<Text*>(pfad->getThis()));
@@ -1335,7 +1335,7 @@ void LTDBFile::remove(ProgressBar* f, Text* name) // Deletes an image from the f
     if (name) name = (Text*)name->release();
 }
 
-Image* LTDBFile::laden(ProgressBar* f, Text* name) // Loads an image from the file
+Image* LTDBFile::load(ProgressBar* f, Text* name) // Loads an image from the file
 {
     if (name)
     {
@@ -1344,9 +1344,9 @@ Image* LTDBFile::laden(ProgressBar* f, Text* name) // Loads an image from the fi
             name->release();
             return 0;
         }
-        if (!datKpf) leseDaten(0);
+        if (!datKpf) readData(0);
         LTDBHeader* k_tmp = new LTDBHeader();
-        k_tmp->Init(dynamic_cast<Text*>(name->getThis()), Punkt(0, 0));
+        k_tmp->Init(dynamic_cast<Text*>(name->getThis()), Point(0, 0));
         int index = datKpf->getImageIndex(k_tmp->getTitel());
         k_tmp->release();
         if (index == -1)
@@ -1366,9 +1366,9 @@ Image* LTDBFile::laden(ProgressBar* f, Text* name) // Loads an image from the fi
         __int64 position = datKpf->getImagePosition(index);
         inF->seekg(position, std::ios::beg);
         LTDBHeader* kpf = new LTDBHeader();
-        kpf->laden(inF);
+        kpf->load(inF);
         Text* t = kpf->getTitel();
-        if (!t->istGleich(*name))
+        if (!t->isEqual(*name))
         { // Error message
             t->release();
             kpf->release();
@@ -1385,7 +1385,7 @@ Image* LTDBFile::laden(ProgressBar* f, Text* name) // Loads an image from the fi
         }
         t->release();
         LTDBBody* kpr = new LTDBBody(dynamic_cast<LTDBHeader*>(kpf->getThis()));
-        kpr->laden(f, inF); // load image
+        kpr->load(f, inF); // load image
         Image* ret = kpr->getImage();
         kpr->release();
         kpf->release();
@@ -1397,7 +1397,7 @@ Image* LTDBFile::laden(ProgressBar* f, Text* name) // Loads an image from the fi
     return 0;
 }
 
-int LTDBFile::speichern(
+int LTDBFile::save(
 ProgressBar* f, Image* bild, Text* name) // Saves an image to the file
 {
     int warn = -1;
@@ -1405,7 +1405,7 @@ ProgressBar* f, Image* bild, Text* name) // Saves an image to the file
     {
         if (FileExists(dynamic_cast<Text*>(pfad->getThis())))
         {
-            if (!datKpf) leseDaten(0);
+            if (!datKpf) readData(0);
             int index
                 = datKpf->getImageIndex(dynamic_cast<Text*>(name->getThis()));
             if (index == -1)
@@ -1433,8 +1433,8 @@ ProgressBar* f, Image* bild, Text* name) // Saves an image to the file
                 {
                     c = (char)('0' + (i % 10));
                     if ((i % 10) == 0) pf_tmp->append("$");
-                    pf_tmp->ersetzen(
-                        pf_tmp->anzahlVon((char)('0' - ((i - 1) % 10))) - 1,
+                    pf_tmp->replace(
+                        pf_tmp->countOf((char)('0' - ((i - 1) % 10))) - 1,
                         (char)('0' - ((i - 1) % 10)),
                         c);
                 }
@@ -1447,9 +1447,9 @@ ProgressBar* f, Image* bild, Text* name) // Saves an image to the file
                     = new std::ofstream(pf_tmp->getText(), std::ios::binary);
                 datKpf->addImage(kpf->getTitel());
                 index = datKpf->getImageIndex(kpf->getTitel());
-                datKpf->speichern(outF);
+                datKpf->save(outF);
                 LTDBFileHeader* kpf_tmp = new LTDBFileHeader();
-                kpf_tmp->laden(0, inF);
+                kpf_tmp->load(0, inF);
                 kpf_tmp->release();
                 __int64 pos_plus = outF->tellp() - inF->tellg();
                 for (int i = 0; i < index; ++i)
@@ -1457,18 +1457,18 @@ ProgressBar* f, Image* bild, Text* name) // Saves an image to the file
                         i, datKpf->getImagePosition(i) + pos_plus);
                 datKpf->setImagePos(index, datLen + pos_plus);
                 outF->seekp(0, std::ios::beg);
-                datKpf->speichern(outF);
+                datKpf->save(outF);
                 char byte = 0;
                 for (__int64 i = inF->tellg(); i < datLen; ++i)
                 {
                     inF->read(&byte, 1);
                     outF->write(&byte, 1);
                 }
-                kpf->speichern(outF); // save image header
+                kpf->save(outF); // save image header
                 LTDBBody* kpr
                     = new LTDBBody(dynamic_cast<LTDBHeader*>(kpf->getThis()));
                 kpr->setImage(dynamic_cast<Image*>(bild->getThis()));
-                kpr->speichern(f, outF); // save image
+                kpr->save(f, outF); // save image
                 kpf->release();
                 kpr->release();
                 inF->close();
@@ -1488,7 +1488,7 @@ ProgressBar* f, Image* bild, Text* name) // Saves an image to the file
 
 RCArray<Text>* LTDBFile::zImageListe() // Lists all images in the file
 {
-    if (!datKpf) leseDaten(0);
+    if (!datKpf) readData(0);
     if (datKpf) return datKpf->zImageListe();
     return 0;
 }
@@ -1499,13 +1499,13 @@ Text* LTDBFile::getPfad() const // Returns the path to the file
     return dynamic_cast<Text*>(pfad->getThis());
 }
 
-int LTDBFile::getImageAnzahl() const
+int LTDBFile::getImageCount() const
 {
     if (!datKpf) return 0;
-    return datKpf->getbAnzahl();
+    return datKpf->getBCount();
 }
 
-bool LTDBFile::istOffen() const // Checks if the file is open
+bool LTDBFile::isOpen() const // Checks if the file is open
 {
     if (!pfad) return 0;
     return FileExists(dynamic_cast<Text*>(pfad->getThis()));
@@ -1535,7 +1535,7 @@ LTDSPixel::~LTDSPixel()
 
 // non-constant
 // intended for loading
-bool LTDSPixel::addBitZuFarbe(unsigned char bit)
+bool LTDSPixel::addBitZuColor(unsigned char bit)
 {
     if (aenderA && iA != miA) // The bit belongs to alpha
     {
@@ -1589,7 +1589,7 @@ char begin) // returns end of pixel, -1 if not finished
                 aenderA = ((byte >> (7 - i)) & Bits(1)) == 1;
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         byte >> (7 - i))) // The bit belongs to the color
                     return i;
             }
@@ -1600,7 +1600,7 @@ char begin) // returns end of pixel, -1 if not finished
                 komp |= (unsigned char)((byte >> (7 - i)) & Bits(1)) << 2;
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         byte >> (7 - i))) // The bit belongs to the color
                     return i;
             }
@@ -1611,7 +1611,7 @@ char begin) // returns end of pixel, -1 if not finished
                 komp |= (unsigned char)((byte >> (7 - i)) & Bits(1)) << 1;
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         byte >> (7 - i))) // The bit belongs to the color
                     return i;
             }
@@ -1629,13 +1629,13 @@ char begin) // returns end of pixel, -1 if not finished
             }
             else
             {
-                if (!addBitZuFarbe(
+                if (!addBitZuColor(
                         byte >> (7 - i))) // The bit belongs to the color
                     return i;
             }
             break;
         default: // The remaining bits all store the color values of the pixel
-            if (!addBitZuFarbe(byte >> (7 - i))) // The bit belongs to the color
+            if (!addBitZuColor(byte >> (7 - i))) // The bit belongs to the color
                 return i;
             break;
         }
@@ -1694,7 +1694,7 @@ void LTDSPixel::Komp() // Compresses the pixel
     }
 }
 
-bool LTDSPixel::getNextFarbeBit(char& byte, int i)
+bool LTDSPixel::getNextColorBit(char& byte, int i)
 {
     unsigned char AA = alpha;
     if (davor)
@@ -1732,7 +1732,7 @@ char LTDSPixel::getNextByte(
                 byte |= ((int)aenderA & Bits(1)) << (7 - i);
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return i;
+                if (!getNextColorBit(byte, i)) return i;
             }
             break;
         case 2: // The second bit of the pixel stores either the color
@@ -1741,7 +1741,7 @@ char LTDSPixel::getNextByte(
                 byte |= ((komp >> 2) & Bits(1)) << (7 - i);
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return i;
+                if (!getNextColorBit(byte, i)) return i;
             }
             break;
         case 3: // The third bit of the pixel stores either the color
@@ -1750,7 +1750,7 @@ char LTDSPixel::getNextByte(
                 byte |= ((komp >> 1) & Bits(1)) << (7 - i);
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return i;
+                if (!getNextColorBit(byte, i)) return i;
             }
             break;
         case 4: // The fourth bit of the pixel stores either the color
@@ -1759,11 +1759,11 @@ char LTDSPixel::getNextByte(
                 byte |= (komp & Bits(1)) << (7 - i);
             else // Color
             {
-                if (!getNextFarbeBit(byte, i)) return i;
+                if (!getNextColorBit(byte, i)) return i;
             }
             break;
         default: // The remaining bits store the color of the pixel
-            if (!getNextFarbeBit(byte, i)) return i;
+            if (!getNextColorBit(byte, i)) return i;
             break;
         }
         ++index;
@@ -1810,7 +1810,7 @@ LTDSFileHeader::~LTDSFileHeader()
 }
 
 // non-constant
-void LTDSFileHeader::laden(std::ifstream* inF) // Loads from inF
+void LTDSFileHeader::load(std::ifstream* inF) // Loads from inF
 {
     if (inF->good() && inF->is_open())
     {
@@ -1884,7 +1884,7 @@ void LTDSFileHeader::removeSG(char sg) // Remove font size
 }
 
 // constant
-void LTDSFileHeader::speichern(std::ofstream* outF) const // Saves to outF
+void LTDSFileHeader::save(std::ofstream* outF) const // Saves to outF
 {
     if (outF->is_open() && outF->good())
     {
@@ -1897,7 +1897,7 @@ void LTDSFileHeader::speichern(std::ofstream* outF) const // Saves to outF
     }
 }
 
-unsigned char* LTDSFileHeader::getSchriftGroesseList()
+unsigned char* LTDSFileHeader::getFontSizeList()
 const // returns a list of stored font sizes
 {
     return gr;
@@ -1909,7 +1909,7 @@ const // returns a position list of stored font sizes
     return pos;
 }
 
-int LTDSFileHeader::getSchriftGroesseAnzahl()
+int LTDSFileHeader::getFontSizeCount()
 const // returns the number of stored font sizes
 {
     return sganzahl;
@@ -1919,7 +1919,7 @@ const // returns the number of stored font sizes
 // Constructor
 LTDSFontHeader::LTDSFontHeader()
     : ReferenceCounter(),
-      schriftSize(0),
+      fontSize(0),
       zeichen(0),
       pos(0),
       zeichenAnzahl(0)
@@ -1933,11 +1933,11 @@ LTDSFontHeader::~LTDSFontHeader()
 }
 
 // non-constant
-void LTDSFontHeader::laden(std::ifstream* inF) // loads from inF
+void LTDSFontHeader::load(std::ifstream* inF) // loads from inF
 {
     if (inF->good() && inF->is_open())
     {
-        inF->read((char*)&schriftSize, 1);
+        inF->read((char*)&fontSize, 1);
         inF->read((char*)&zeichenAnzahl, 1);
         delete[] pos;
         delete[] zeichen;
@@ -1952,13 +1952,13 @@ void LTDSFontHeader::laden(std::ifstream* inF) // loads from inF
     }
 }
 
-void LTDSFontHeader::setSchriftgroesse(
+void LTDSFontHeader::setFontSize(
 unsigned char gr) // set font size
 {
-    schriftSize = gr;
+    fontSize = gr;
 }
 
-void LTDSFontHeader::setZeichenAlphabet(
+void LTDSFontHeader::setCharAlphabet(
 Alphabet* alphabet) // sets the characters from alphabet
 {
     int count = 0;
@@ -1985,11 +1985,11 @@ Alphabet* alphabet) // sets the characters from alphabet
             zeich->release();
         }
     }
-    schriftSize = alphabet->getSchriftSize();
+    fontSize = alphabet->getFontSize();
     alphabet->release();
 }
 
-void LTDSFontHeader::addZeichen(unsigned char zeichen) // Add character
+void LTDSFontHeader::addChar(unsigned char zeichen) // Add character
 {
     ++zeichenAnzahl;
     unsigned char* zeichen_tmp = this->zeichen;
@@ -2008,7 +2008,7 @@ void LTDSFontHeader::addZeichen(unsigned char zeichen) // Add character
     pos[zeichenAnzahl] = 0;
 }
 
-void LTDSFontHeader::removeZeichen(unsigned char zeich) // Remove character
+void LTDSFontHeader::removeChar(unsigned char zeich) // Remove character
 {
     bool hatZ = 0;
     int zPos = 0;
@@ -2042,12 +2042,12 @@ void LTDSFontHeader::removeZeichen(unsigned char zeich) // Remove character
 }
 
 // constant
-void LTDSFontHeader::speichern(
+void LTDSFontHeader::save(
 std::ofstream* outF) const // saves to outF
 {
     if (outF->good() && outF->is_open())
     {
-        outF->write((char*)&schriftSize, 1);
+        outF->write((char*)&fontSize, 1);
         outF->write((char*)&zeichenAnzahl, 1);
         for (int i = 0; i < zeichenAnzahl; ++i)
         {
@@ -2058,13 +2058,13 @@ std::ofstream* outF) const // saves to outF
 }
 
 unsigned char
-LTDSFontHeader::getSchriftGroesse() const // returns the font size
+LTDSFontHeader::getFontSize() const // returns the font size
 {
-    return schriftSize;
+    return fontSize;
 }
 
 unsigned char
-LTDSFontHeader::getZeichenAnzahl() const // returns the character count
+LTDSFontHeader::getCharCount() const // returns the character count
 {
     return zeichenAnzahl;
 }
@@ -2075,7 +2075,7 @@ const // returns the character positions
     return pos;
 }
 
-unsigned char* LTDSFontHeader::getZeichen() const // returns the characters
+unsigned char* LTDSFontHeader::getChar() const // returns the characters
 {
     return zeichen;
 }
@@ -2089,7 +2089,7 @@ LTDSCharacterHeader::LTDSCharacterHeader()
 {}
 
 // non-constant
-void LTDSCharacterHeader::laden(std::ifstream* inF) // loads from inF
+void LTDSCharacterHeader::load(std::ifstream* inF) // loads from inF
 {
     if (inF->good() && inF->is_open())
     {
@@ -2100,7 +2100,7 @@ void LTDSCharacterHeader::laden(std::ifstream* inF) // loads from inF
 }
 
 void LTDSCharacterHeader::init(unsigned char zeichen,
-const Punkt& groesse) // initialization (for saving)
+const Point& groesse) // initialization (for saving)
 {
     this->zeichen = zeichen;
     this->size = groesse;
@@ -2113,7 +2113,7 @@ void LTDSCharacterHeader::init(unsigned char zeichen, int br, int hoe)
 }
 
 // constant
-void LTDSCharacterHeader::speichern(
+void LTDSCharacterHeader::save(
 std::ofstream* outF) const // saves to outF
 {
     if (outF->good() && outF->is_open())
@@ -2124,22 +2124,22 @@ std::ofstream* outF) const // saves to outF
     }
 }
 
-unsigned char LTDSCharacterHeader::getZeichen() const // returns the character
+unsigned char LTDSCharacterHeader::getChar() const // returns the character
 {
     return zeichen;
 }
 
-int LTDSCharacterHeader::getBreite() const // returns the width
+int LTDSCharacterHeader::getWidth() const // returns the width
 {
     return size.x;
 }
 
-int LTDSCharacterHeader::getHoehe() const // returns the height
+int LTDSCharacterHeader::getHeight() const // returns the height
 {
     return size.y;
 }
 
-const Punkt& LTDSCharacterHeader::getGroesse() const // returns the size
+const Point& LTDSCharacterHeader::getSize() const // returns the size
 {
     return size;
 }
@@ -2148,8 +2148,8 @@ const Punkt& LTDSCharacterHeader::getGroesse() const // returns the size
 // Constructor
 LTDSCharacterBody::LTDSCharacterBody(LTDSCharacterHeader* kopf)
     : ReferenceCounter(),
-      size(kopf->getGroesse()),
-      zeichen(kopf->getZeichen()),
+      size(kopf->getSize()),
+      zeichen(kopf->getChar()),
       buchstabe(new Character())
 {
     buchstabe->NewCharacter(size);
@@ -2170,7 +2170,7 @@ void LTDSCharacterBody::setCharacter(
     buchstabe = zeichen;
 }
 
-void LTDSCharacterBody::laden(std::ifstream* inF) // Loads from inF
+void LTDSCharacterBody::load(std::ifstream* inF) // Loads from inF
 {
     if (inF->good() && inF->is_open())
     {
@@ -2204,7 +2204,7 @@ void LTDSCharacterBody::laden(std::ifstream* inF) // Loads from inF
 }
 
 // constant
-void LTDSCharacterBody::speichern(
+void LTDSCharacterBody::save(
 std::ofstream* outF) const // saves to outF
 {
     if (outF->good() && outF->is_open())
@@ -2260,7 +2260,7 @@ LTDSCharacterBody::getCharacter() const // returns the character
 }
 
 unsigned char
-LTDSCharacterBody::getZeichen() const // returns the character
+LTDSCharacterBody::getChar() const // returns the character
 {
     return zeichen;
 }
@@ -2288,33 +2288,33 @@ void LTDSFile::setPfad(Text* txt) // sets the path to the file
     txt->release();
 }
 
-void LTDSFile::leseDaten() // reads the file header
+void LTDSFile::readData() // reads the file header
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return;
     if (dateiKopf) dateiKopf->release();
     dateiKopf = new LTDSFileHeader();
     std::ifstream* inF = new std::ifstream(pfad->getText(), std::ios::binary);
-    dateiKopf->laden(inF);
+    dateiKopf->load(inF);
     inF->close();
     delete inF;
 }
 
-void LTDSFile::addSchriftgroesse(
+void LTDSFile::addFontSize(
     Alphabet* alphabet) // adds a font size
 {
     if (!FileExists(dynamic_cast<Text*>(
             pfad->getThis()))) // check if the file exists
         return;
     if (!dateiKopf) // check if the file header has been read
-        leseDaten();
+        readData();
     int sgroesse
         = alphabet
-              ->getSchriftSize(); // font size to be added
+              ->getFontSize(); // font size to be added
     unsigned char* sglist
-        = dateiKopf->getSchriftGroesseList(); // list of already existing
+        = dateiKopf->getFontSizeList(); // list of already existing
                                               // font sizes
     unsigned char sganzahl
-        = dateiKopf->getSchriftGroesseAnzahl(); // number of already
+        = dateiKopf->getFontSizeCount(); // number of already
                                                 // existing font sizes
     for (int i = 0; i < sganzahl;
         ++i) // check if the font size already exists
@@ -2329,14 +2329,14 @@ void LTDSFile::addSchriftgroesse(
     int* sgPosList
         = dateiKopf
               ->getPositionList(); // list of font size positions
-    sglist = dateiKopf->getSchriftGroesseList(); // list of already
+    sglist = dateiKopf->getFontSizeList(); // list of already
                                                  // existing font sizes
     std::ifstream* inF
         = new std::ifstream(pfad->getText(), std::ios::binary); // old file
     pfad->append("0");
     std::ofstream* outF
         = new std::ofstream(pfad->getText(), std::ios::binary); // new file
-    dateiKopf->speichern(outF); // save file header to new file
+    dateiKopf->save(outF); // save file header to new file
     inF->seekg(1 + 5 * sganzahl,
         std::ios::beg); // position of the first font size in the old file
     for (int i = 0; i < sganzahl;
@@ -2344,16 +2344,16 @@ void LTDSFile::addSchriftgroesse(
     {
         LTDSFontHeader* sgKpf_tmp
             = new LTDSFontHeader(); // font size header
-        sgKpf_tmp->laden(inF);       // load from old file
+        sgKpf_tmp->load(inF);       // load from old file
         int* zeichP_tmp
             = sgKpf_tmp
                   ->getPositionen(); // character positions of the font size
         unsigned char zeichA_tmp
             = sgKpf_tmp
-                  ->getZeichenAnzahl(); // number of characters in the font size
+                  ->getCharCount(); // number of characters in the font size
         for (int i1 = 0; i1 < zeichA_tmp; ++i1)
             zeichP_tmp[i1] += 5; // update character positions
-        sgKpf_tmp->speichern(
+        sgKpf_tmp->save(
             outF); // save font size header to new file
         int beginByte
             = (int)inF->tellg(); // copy remaining bytes until the next
@@ -2378,13 +2378,13 @@ void LTDSFile::addSchriftgroesse(
     outF->seekp(0, std::ios::beg);
     for (int i = 0; i < sganzahl; ++i) // update positions in file header
         sgPosList[i] += 5;
-    dateiKopf->speichern(outF); // save updated file header
+    dateiKopf->save(outF); // save updated file header
     outF->seekp(sgPosList[sganzahl], std::ios::beg);
     LTDSFontHeader* sgkopf
         = new LTDSFontHeader(); // header of the new font size
-    sgkopf->setZeichenAlphabet(dynamic_cast<Alphabet*>(
+    sgkopf->setCharAlphabet(dynamic_cast<Alphabet*>(
         alphabet->getThis())); // initialize font size header
-    sgkopf->speichern(outF);   // save font size header
+    sgkopf->save(outF);   // save font size header
     int* BuchstabenPosList
         = sgkopf->getPositionen(); // positions of the different characters
                                    // in the file (still 0)
@@ -2398,21 +2398,21 @@ void LTDSFile::addSchriftgroesse(
                 = (int)outF->tellp(); // set character position
             LTDSCharacterHeader* zeichKpf
                 = new LTDSCharacterHeader(); // character header
-            zeichKpf->init(i, zeich->getBreite(), zeich->getHeight());
-            zeichKpf->speichern(outF); // save character header
+            zeichKpf->init(i, zeich->getWidth(), zeich->getHeight());
+            zeichKpf->save(outF); // save character header
             LTDSCharacterBody* zeichKoerp
                 = new LTDSCharacterBody(dynamic_cast<LTDSCharacterHeader*>(
                     zeichKpf->getThis())); // character body
             zeichKpf->release();
             zeichKoerp->setCharacter(
                 dynamic_cast<Character*>(zeich->getThis()));
-            zeichKoerp->speichern(outF); // save character body
+            zeichKoerp->save(outF); // save character body
             zeich->release();
             ++count;
         }
     }
     outF->seekp(sgPosList[sganzahl], std::ios::beg);
-    sgkopf->speichern(outF); // save updated font size header
+    sgkopf->save(outF); // save updated font size header
     outF->close();
     Text* pfad2 = new Text();
     pfad2->setText(pfad->getText());
@@ -2428,7 +2428,7 @@ void LTDSFile::addSchriftgroesse(
     alphabet->release();
 }
 
-void LTDSFile::addBuchstabe(int gr,
+void LTDSFile::addCharacter(int gr,
     Character* zeich,
     unsigned char zeichen) // Adds a character to a font size
 {
@@ -2439,14 +2439,14 @@ void LTDSFile::addBuchstabe(int gr,
         return;
     }
     if (!dateiKopf) // check if the file header was loaded
-        leseDaten();
+        readData();
     unsigned char* sgList
-        = dateiKopf->getSchriftGroesseList(); // list of font sizes from
+        = dateiKopf->getFontSizeList(); // list of font sizes from
                                               // the file
     int* sgPosList = dateiKopf->getPositionList(); // list of font size
                                                    // positions from file
     unsigned char sgAnzahl
-        = dateiKopf->getSchriftGroesseAnzahl(); // number of font sizes
+        = dateiKopf->getFontSizeCount(); // number of font sizes
                                                 // from the file
     int sgNum = -1;
     for (int i = 0; i < sgAnzahl;
@@ -2469,8 +2469,8 @@ void LTDSFile::addBuchstabe(int gr,
     {
         dateiKopf->addSG(gr); // add font size to file header
         sgPosList = dateiKopf->getPositionList();
-        sgList = dateiKopf->getSchriftGroesseList();
-        dateiKopf->speichern(outF); // save file header
+        sgList = dateiKopf->getFontSizeList();
+        dateiKopf->save(outF); // save file header
         inF->seekg(1 + 5 * sgAnzahl,
             std::ios::beg); // position of the first
                             // font size in the old file
@@ -2479,16 +2479,16 @@ void LTDSFile::addBuchstabe(int gr,
         {
             LTDSFontHeader* sgKpf_tmp
                 = new LTDSFontHeader(); // font size header
-            sgKpf_tmp->laden(inF);       // load from old file
+            sgKpf_tmp->load(inF);       // load from old file
             int* zeichP_tmp
                 = sgKpf_tmp
                       ->getPositionen(); // character positions of the font size
             unsigned char zeichA_tmp
-                = sgKpf_tmp->getZeichenAnzahl(); // number of characters in
+                = sgKpf_tmp->getCharCount(); // number of characters in
                                                  // the font size
             for (int i1 = 0; i1 < zeichA_tmp; ++i1)
                 zeichP_tmp[i1] += 5; // update character positions
-            sgKpf_tmp->speichern(
+            sgKpf_tmp->save(
                 outF); // save font size header to new file
             int beginByte
                 = (int)inF->tellg(); // copy remaining bytes until the next
@@ -2513,30 +2513,30 @@ void LTDSFile::addBuchstabe(int gr,
         for (int i = 0; i < sgAnzahl;
             ++i) // update positions in file header
             sgPosList[i] += 5;
-        dateiKopf->speichern(outF); // save updated file header
+        dateiKopf->save(outF); // save updated file header
         outF->seekp(sgPosList[sgAnzahl], std::ios::beg);
         LTDSFontHeader* sgKpf
             = new LTDSFontHeader(); // initialize font size header
-        sgKpf->setSchriftgroesse(gr);
-        sgKpf->addZeichen(zeichen);
+        sgKpf->setFontSize(gr);
+        sgKpf->addChar(zeichen);
         sgKpf->getPositionen()[0] = (int)outF->tellp() + 7;
-        sgKpf->speichern(outF); // save font size header
+        sgKpf->save(outF); // save font size header
         sgKpf->release();
         LTDSCharacterHeader* zeichKpf
             = new LTDSCharacterHeader(); // character header
         zeichKpf->init(zeichen, zeich->getSize());
-        zeichKpf->speichern(outF); // save character header
+        zeichKpf->save(outF); // save character header
         LTDSCharacterBody* zeichKoerp
             = new LTDSCharacterBody(dynamic_cast<LTDSCharacterHeader*>(
                 zeichKpf->getThis())); // character body
         zeichKpf->release();
         zeichKoerp->setCharacter(dynamic_cast<Character*>(zeich->getThis()));
-        zeichKoerp->speichern(outF); // save character body
+        zeichKoerp->save(outF); // save character body
         zeichKoerp->release();
     }
     else
     {
-        dateiKopf->speichern(outF); // save file header
+        dateiKopf->save(outF); // save file header
         int beginByte
             = 1 + 5 * sgAnzahl; // copy remaining bytes until the next
                                 // font size to new file
@@ -2549,10 +2549,10 @@ void LTDSFile::addBuchstabe(int gr,
             outF->write(&byte, 1);
         }
         LTDSFontHeader* sgKpf = new LTDSFontHeader(); // font size header
-        sgKpf->laden(inF);
-        for (int i = 0; i < sgKpf->getZeichenAnzahl(); ++i)
+        sgKpf->load(inF);
+        for (int i = 0; i < sgKpf->getCharCount(); ++i)
             sgKpf->getPositionen()[i] += 5;
-        sgKpf->addZeichen(zeichen);
+        sgKpf->addChar(zeichen);
         int indexPlus = 5;
         int zeichenPos = sgPosList[sgNum + 1]; // position of the new character
         if (sgNum + 1 >= sgAnzahl)
@@ -2563,8 +2563,8 @@ void LTDSFile::addBuchstabe(int gr,
             inF->seekg(tmp, std::ios::beg);
         }
         zeichenPos += indexPlus;
-        sgKpf->getPositionen()[sgKpf->getZeichenAnzahl() - 1] = zeichenPos;
-        sgKpf->speichern(outF); // save font size header
+        sgKpf->getPositionen()[sgKpf->getCharCount() - 1] = zeichenPos;
+        sgKpf->save(outF); // save font size header
         sgKpf->release();
         for (int i = (int)inF->tellg() + indexPlus; i < zeichenPos;
             ++i) // copy operation up to the character start
@@ -2574,37 +2574,37 @@ void LTDSFile::addBuchstabe(int gr,
         }
         LTDSCharacterHeader* zeichKpf = new LTDSCharacterHeader(); // character header
         zeichKpf->init(zeichen, zeich->getSize());
-        zeichKpf->speichern(outF); // save character header
+        zeichKpf->save(outF); // save character header
         LTDSCharacterBody* zeichKoerp
             = new LTDSCharacterBody(dynamic_cast<LTDSCharacterHeader*>(
                 zeichKpf->getThis())); // character body
         zeichKpf->release();
         zeichKoerp->setCharacter(dynamic_cast<Character*>(zeich->getThis()));
-        zeichKoerp->speichern(outF); // save character body
+        zeichKoerp->save(outF); // save character body
         zeichKoerp->release();
         int nowPos = (int)outF->tellp();
         indexPlus += nowPos - zeichenPos;
         for (int i = sgNum + 1; i < sgAnzahl; ++i) // update file header
             sgPosList[i] += indexPlus;
         outF->seekp(0, std::ios::beg);
-        dateiKopf->speichern(outF); // save file header
+        dateiKopf->save(outF); // save file header
         outF->seekp(nowPos, std::ios::beg);
         for (int i = sgNum + 1; i < sgAnzahl;
             ++i) // update remaining font sizes
         {
             LTDSFontHeader* sgKpf_tmp
                 = new LTDSFontHeader(); // font size header
-            sgKpf_tmp->laden(inF);       // load from old file
+            sgKpf_tmp->load(inF);       // load from old file
             int* zeichP_tmp
                 = sgKpf_tmp
                       ->getPositionen(); // character positions of the font size
             unsigned char zeichA_tmp
-                = sgKpf_tmp->getZeichenAnzahl(); // number of characters in
+                = sgKpf_tmp->getCharCount(); // number of characters in
                                                  // the font size
             for (int i1 = 0; i1 < zeichA_tmp; ++i1)
                 zeichP_tmp[i1]
                     += indexPlus; // update character positions
-            sgKpf_tmp->speichern(
+            sgKpf_tmp->save(
                 outF); // save font size header to new file
             int beginByte
                 = (int)inF->tellg(); // copy remaining bytes until the next
@@ -2638,18 +2638,18 @@ void LTDSFile::addBuchstabe(int gr,
     zeich->release();
 }
 
-void LTDSFile::loescheSchrifrGroesse(
+void LTDSFile::deleteFontSize(
     int gr) // Deletes a font size from the file
 {
     if (!FileExists(dynamic_cast<Text*>(
             pfad->getThis()))) // check if file exists
         return;
     if (!dateiKopf) // check if the file header was loaded
-        leseDaten();
+        readData();
     unsigned char* sgList
-        = dateiKopf->getSchriftGroesseList(); // list of font sizes
+        = dateiKopf->getFontSizeList(); // list of font sizes
     unsigned char sgAnzahl
-        = dateiKopf->getSchriftGroesseAnzahl(); // number of font sizes
+        = dateiKopf->getFontSizeCount(); // number of font sizes
     int sgNum = -1;
     for (int i = 0; i < sgAnzahl; ++i) // search for font size to delete
     {
@@ -2676,14 +2676,14 @@ void LTDSFile::loescheSchrifrGroesse(
     {
         LTDSFontHeader* sgKpf_tmp
             = new LTDSFontHeader(); // font size header
-        sgKpf_tmp->laden(inF);       // load font size header
+        sgKpf_tmp->load(inF);       // load font size header
         int* zeichPosLTmp = sgKpf_tmp->getPositionen(); // character positions
         unsigned char zeichATmp
-            = sgKpf_tmp->getZeichenAnzahl(); // character count
+            = sgKpf_tmp->getCharCount(); // character count
         for (int i1 = 0; i1 < zeichATmp;
             ++i1) // move character positions back by 5 bytes
             zeichPosLTmp[i1] -= 5;
-        sgKpf_tmp->speichern(outF); // save to new file
+        sgKpf_tmp->save(outF); // save to new file
         char byte = 0;
         for (int i1 = (int)inF->tellg(); i1 < sgPosList[i + 1];
             ++i1) // copy the character body
@@ -2700,14 +2700,14 @@ void LTDSFile::loescheSchrifrGroesse(
     {
         LTDSFontHeader* sgKpf_tmp
             = new LTDSFontHeader(); // font size header
-        sgKpf_tmp->laden(inF);       // load font size header
+        sgKpf_tmp->load(inF);       // load font size header
         int* zeichPosLTmp = sgKpf_tmp->getPositionen(); // character positions
         unsigned char zeichATmp
-            = sgKpf_tmp->getZeichenAnzahl(); // character count
+            = sgKpf_tmp->getCharCount(); // character count
         for (int i1 = 0; i1 < zeichATmp;
             ++i1) // update character positions
             zeichPosLTmp[i1] -= indexMinus;
-        sgKpf_tmp->speichern(outF); // save to new file
+        sgKpf_tmp->save(outF); // save to new file
         char byte = 0;
         int BeginByte = (int)inF->tellg();
         int EndByte = sgPosList[i + 1];
@@ -2730,7 +2730,7 @@ void LTDSFile::loescheSchrifrGroesse(
         sgPosList[i] -= indexMinus;
     dateiKopf->removeSG(gr);
     outF->seekp(0, std::ios::beg);
-    dateiKopf->speichern(outF); // save file header
+    dateiKopf->save(outF); // save file header
     inF->close();
     outF->close();
     Text* pfad2 = new Text(pfad->getText());
@@ -2743,18 +2743,18 @@ void LTDSFile::loescheSchrifrGroesse(
     delete outF;
 }
 
-void LTDSFile::loescheBuchstabe(
+void LTDSFile::deleteCharacter(
     int gr, unsigned char zeichen) // Deletes a character from the file
 {
     if (!FileExists(dynamic_cast<Text*>(
             pfad->getThis()))) // check if the file exists
         return;
     if (!dateiKopf) // check if the file header was read
-        leseDaten();
+        readData();
     unsigned char* sgList
-        = dateiKopf->getSchriftGroesseList(); // list of font sizes
+        = dateiKopf->getFontSizeList(); // list of font sizes
     unsigned char sgAnzahl
-        = dateiKopf->getSchriftGroesseAnzahl(); // number of font sizes
+        = dateiKopf->getFontSizeCount(); // number of font sizes
     int* sgPosList
         = dateiKopf
               ->getPositionList(); // list of font size positions
@@ -2776,14 +2776,14 @@ void LTDSFile::loescheBuchstabe(
         = new std::ofstream(pfad->getText(), std::ios::binary); // new file
     int indexMinus = 0;
     inF->seekg(1 + 5 * sgAnzahl, std::ios::beg);
-    dateiKopf->speichern(outF); // save file header
+    dateiKopf->save(outF); // save file header
     for (int i = 0; i < sgAnzahl; ++i)
     {
         LTDSFontHeader* sgKopf = new LTDSFontHeader(); // font header
-        sgKopf->laden(inF);                              // load font header
+        sgKopf->load(inF);                              // load font header
         unsigned char sgZeichAnzahl
-            = sgKopf->getZeichenAnzahl();                    // character count
-        unsigned char* sgZeichenList = sgKopf->getZeichen(); // character list
+            = sgKopf->getCharCount();                    // character count
+        unsigned char* sgZeichenList = sgKopf->getChar(); // character list
         int* sgZPosList = sgKopf->getPositionen();           // position list
         if (i == sgNum) // character is in this font size
         {
@@ -2858,14 +2858,14 @@ void LTDSFile::loescheBuchstabe(
                 sgZPosList[i1]
                     -= indexMinus; // update font size header
             }
-            sgKopf->removeZeichen(zeichen);
+            sgKopf->removeChar(zeichen);
         }
         else
         {
             for (int i1 = 0; i1 < sgZeichAnzahl;
                 ++i1) // update font size header
                 sgZPosList[i] -= indexMinus;
-            sgKopf->speichern(outF); // save font size header
+            sgKopf->save(outF); // save font size header
             int beginByte = (int)inF->tellg();
             int endByte = sgPosList[i + 1];
             if (!endByte)
@@ -2883,7 +2883,7 @@ void LTDSFile::loescheBuchstabe(
             sgPosList[i] -= indexMinus;
         }
         outF->seekp(sgPosList[i], std::ios::beg);
-        sgKopf->speichern(outF); // save font size header
+        sgKopf->save(outF); // save font size header
         outF->seekp(sgPosList[i + 1], std::ios::beg);
         sgKopf->release();
     }
@@ -2903,7 +2903,7 @@ void LTDSFile::loescheBuchstabe(
 void LTDSFile::deleteFile() // Deletes the entire file
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return;
-    if (!dateiKopf) leseDaten();
+    if (!dateiKopf) readData();
     FileRemove(dynamic_cast<Text*>(pfad->getThis()));
 }
 
@@ -2913,17 +2913,17 @@ void LTDSFile::createFile() // creates the file
     if (dateiKopf) dateiKopf->release();
     dateiKopf = new LTDSFileHeader();
     std::ofstream* outF = new std::ofstream(pfad->getText(), std::ios::binary);
-    dateiKopf->speichern(outF);
+    dateiKopf->save(outF);
     outF->close();
     delete outF;
 }
 
 void LTDSFile::saveFont(
-Font* schrift) // Saves the provided font
+Font* font) // Saves the provided font
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis())))
     {
-        schrift->release();
+        font->release();
         return;
     }
     deleteFile();
@@ -2931,38 +2931,38 @@ Font* schrift) // Saves the provided font
     dateiKopf = new LTDSFileHeader();
     for (int i = 0; i < 256; ++i)
     {
-        Alphabet* alp = schrift->getAlphabet((unsigned char)i);
+        Alphabet* alp = font->getAlphabet((unsigned char)i);
         if (alp)
         {
-            dateiKopf->addSG((char)alp->getSchriftSize());
+            dateiKopf->addSG((char)alp->getFontSize());
             alp->release();
         }
     }
     std::ofstream* outF = new std::ofstream(pfad->getText(), std::ios::binary);
-    dateiKopf->speichern(outF);
+    dateiKopf->save(outF);
     for (int i = 0; i < 256; ++i)
     {
-        Alphabet* alp = schrift->getAlphabet((unsigned char)i);
+        Alphabet* alp = font->getAlphabet((unsigned char)i);
         if (alp)
         {
             dateiKopf->getPositionList()[i] = (int)outF->tellp();
             LTDSFontHeader* sgKpf = new LTDSFontHeader();
-            sgKpf->setZeichenAlphabet(dynamic_cast<Alphabet*>(alp->getThis()));
-            sgKpf->speichern(outF);
-            for (int i1 = 0; i1 < sgKpf->getZeichenAnzahl(); ++i1)
+            sgKpf->setCharAlphabet(dynamic_cast<Alphabet*>(alp->getThis()));
+            sgKpf->save(outF);
+            for (int i1 = 0; i1 < sgKpf->getCharCount(); ++i1)
             {
                 sgKpf->getPositionen()[i1] = (int)outF->tellp();
                 LTDSCharacterHeader* zeichKpf = new LTDSCharacterHeader();
-                Character* zeichen = alp->getCharacter(sgKpf->getZeichen()[i1]);
-                zeichKpf->init(sgKpf->getZeichen()[i1],
-                    zeichen->getBreite(),
+                Character* zeichen = alp->getCharacter(sgKpf->getChar()[i1]);
+                zeichKpf->init(sgKpf->getChar()[i1],
+                    zeichen->getWidth(),
                     zeichen->getHeight());
-                zeichKpf->speichern(outF);
+                zeichKpf->save(outF);
                 LTDSCharacterBody* zeichKoerp = new LTDSCharacterBody(
                     dynamic_cast<LTDSCharacterHeader*>(zeichKpf->getThis()));
                 zeichKoerp->setCharacter(
                     dynamic_cast<Character*>(zeichen->getThis()));
-                zeichKoerp->speichern(outF);
+                zeichKoerp->save(outF);
                 zeichKoerp->release();
                 zeichen->release();
                 zeichKpf->release();
@@ -2970,16 +2970,16 @@ Font* schrift) // Saves the provided font
             alp->release();
             int p = (int)outF->tellp();
             outF->seekp(dateiKopf->getPositionList()[i], std::ios::beg);
-            sgKpf->speichern(outF);
+            sgKpf->save(outF);
             outF->seekp(p, std::ios::beg);
             sgKpf->release();
         }
     }
     outF->seekp(0, std::ios::beg);
-    dateiKopf->speichern(outF);
+    dateiKopf->save(outF);
     outF->close();
     delete outF;
-    schrift->release();
+    font->release();
 }
 
 // constant
@@ -2990,21 +2990,21 @@ Font* LTDSFile::loadFont() // returns the loaded font
     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)
+    for (int i = 0; i < dateiKopf->getFontSizeCount(); ++i)
     {
         LTDSFontHeader* sgKpf = new LTDSFontHeader();
-        sgKpf->laden(inF);
+        sgKpf->load(inF);
         Alphabet* alphabet = new Alphabet();
-        alphabet->setSchriftSize(sgKpf->getSchriftGroesse());
-        for (int i1 = 0; i1 < sgKpf->getZeichenAnzahl(); ++i1)
+        alphabet->setFontSize(sgKpf->getFontSize());
+        for (int i1 = 0; i1 < sgKpf->getCharCount(); ++i1)
         {
             LTDSCharacterHeader* zeichKpf = new LTDSCharacterHeader();
-            zeichKpf->laden(inF);
+            zeichKpf->load(inF);
             LTDSCharacterBody* zeichKoerp = new LTDSCharacterBody(
                 dynamic_cast<LTDSCharacterHeader*>(zeichKpf->getThis()));
-            zeichKoerp->laden(inF);
+            zeichKoerp->load(inF);
             alphabet->setCharacter(
-                zeichKpf->getZeichen(), zeichKoerp->getCharacter());
+                zeichKpf->getChar(), zeichKoerp->getCharacter());
             zeichKoerp->release();
             zeichKpf->release();
         }
@@ -3017,17 +3017,17 @@ Font* LTDSFile::loadFont() // returns the loaded font
     return ret;
 }
 
-Alphabet* LTDSFile::ladeAlphabet(
-int schriftgroesse) // returns a loaded font with only the specified
+Alphabet* LTDSFile::loadAlphabet(
+int fontgroesse) // returns a loaded font with only the specified
                     // font size
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     Alphabet* ret = 0;
     int sgNum = -1;
-    for (int i = 0; i < dateiKopf->getSchriftGroesseAnzahl(); ++i)
+    for (int i = 0; i < dateiKopf->getFontSizeCount(); ++i)
     {
-        if (dateiKopf->getSchriftGroesseList()[i] == schriftgroesse)
+        if (dateiKopf->getFontSizeList()[i] == fontgroesse)
         {
             sgNum = i;
             break;
@@ -3036,19 +3036,19 @@ int schriftgroesse) // returns a loaded font with only the specified
     if (sgNum == -1) return 0;
     ret = new Alphabet();
     ret->NeuAlphabet();
-    ret->setSchriftSize(schriftgroesse);
+    ret->setFontSize(fontgroesse);
     std::ifstream* inF = new std::ifstream(pfad->getText(), std::ios::binary);
     inF->seekg(dateiKopf->getPositionList()[sgNum], std::ios::beg);
     LTDSFontHeader* sgKpf = new LTDSFontHeader();
-    sgKpf->laden(inF);
-    for (int i = 0; i < sgKpf->getZeichenAnzahl(); ++i)
+    sgKpf->load(inF);
+    for (int i = 0; i < sgKpf->getCharCount(); ++i)
     {
         LTDSCharacterHeader* sgZKpf = new LTDSCharacterHeader();
-        sgZKpf->laden(inF);
+        sgZKpf->load(inF);
         LTDSCharacterBody* sgZKoerp = new LTDSCharacterBody(
             dynamic_cast<LTDSCharacterHeader*>(sgZKpf->getThis()));
-        sgZKoerp->laden(inF);
-        ret->setCharacter(sgZKpf->getZeichen(), sgZKoerp->getCharacter());
+        sgZKoerp->load(inF);
+        ret->setCharacter(sgZKpf->getChar(), sgZKoerp->getCharacter());
         sgZKoerp->release();
         sgZKpf->release();
     }
@@ -3058,16 +3058,16 @@ int schriftgroesse) // returns a loaded font with only the specified
     return ret;
 }
 
-Character* LTDSFile::loadCharacter(int schriftgroesse,
+Character* LTDSFile::loadCharacter(int fontgroesse,
 unsigned char zeichen) // Loads a specific character
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     Character* ret = 0;
     int sgNum = -1;
-    for (int i = 0; i < dateiKopf->getSchriftGroesseAnzahl(); ++i)
+    for (int i = 0; i < dateiKopf->getFontSizeCount(); ++i)
     {
-        if (dateiKopf->getSchriftGroesseList()[i] == schriftgroesse)
+        if (dateiKopf->getFontSizeList()[i] == fontgroesse)
         {
             sgNum = i;
             break;
@@ -3077,11 +3077,11 @@ unsigned char zeichen) // Loads a specific character
     std::ifstream* inF = new std::ifstream(pfad->getText(), std::ios::binary);
     inF->seekg(dateiKopf->getPositionList()[sgNum], std::ios::beg);
     LTDSFontHeader* sgKpf = new LTDSFontHeader();
-    sgKpf->laden(inF);
+    sgKpf->load(inF);
     int sgZNum = -1;
-    for (int i = 0; i < sgKpf->getZeichenAnzahl(); ++i)
+    for (int i = 0; i < sgKpf->getCharCount(); ++i)
     {
-        if (sgKpf->getZeichen()[i] == zeichen)
+        if (sgKpf->getChar()[i] == zeichen)
         {
             sgZNum = i;
             break;
@@ -3091,10 +3091,10 @@ unsigned char zeichen) // Loads a specific character
     {
         inF->seekg(sgKpf->getPositionen()[sgZNum], std::ios::beg);
         LTDSCharacterHeader* sgZKpf = new LTDSCharacterHeader();
-        sgZKpf->laden(inF);
+        sgZKpf->load(inF);
         LTDSCharacterBody* sgZKoerp = new LTDSCharacterBody(
             dynamic_cast<LTDSCharacterHeader*>(sgZKpf->getThis()));
-        sgZKoerp->laden(inF);
+        sgZKoerp->load(inF);
         ret = sgZKoerp->getCharacter();
         sgZKoerp->release();
         sgZKpf->release();
@@ -3104,7 +3104,7 @@ unsigned char zeichen) // Loads a specific character
     delete inF;
     if (ret)
     {
-        ret->setSchriftSize(schriftgroesse);
+        ret->setFontSize(fontgroesse);
     }
     return ret;
 }
@@ -3114,32 +3114,32 @@ Text* LTDSFile::getPfad() const // returns the file path
     return dynamic_cast<Text*>(pfad->getThis());
 }
 
-int LTDSFile::getAnzahlSchriftgroessen()
+int LTDSFile::getFontSizeCount()
 const // returns the number of font sizes from the file
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
-    return dateiKopf->getSchriftGroesseAnzahl();
+    return dateiKopf->getFontSizeCount();
 }
 
-unsigned char* LTDSFile::getSchriftGroessen()
+unsigned char* LTDSFile::getFontSizes()
 const // returns an array of font sizes
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
-    return dateiKopf->getSchriftGroesseList();
+    return dateiKopf->getFontSizeList();
 }
 
-unsigned char LTDSFile::getAnzahlBuchstaben(
+unsigned char LTDSFile::getCharacterCount(
 int sg) // returns the number of stored characters for a font size
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     int ret = 0;
-    unsigned char* groessen = dateiKopf->getSchriftGroesseList();
-    unsigned char granzahl = dateiKopf->getSchriftGroesseAnzahl();
+    unsigned char* groessen = dateiKopf->getFontSizeList();
+    unsigned char sizeCount = dateiKopf->getFontSizeCount();
     int grpos = -1;
-    for (int i = 0; i < granzahl; ++i)
+    for (int i = 0; i < sizeCount; ++i)
     {
         if (groessen[i] == sg)
         {
@@ -3154,8 +3154,8 @@ int sg) // returns the number of stored characters for a font size
         std::ifstream* inF
             = new std::ifstream(pfad->getText(), std::ios::binary);
         inF->seekg(grposlist[grpos], std::ios::beg);
-        sgkpf->laden(inF);
-        ret = sgkpf->getZeichenAnzahl();
+        sgkpf->load(inF);
+        ret = sgkpf->getCharCount();
         sgkpf->release();
         inF->close();
         delete inF;
@@ -3163,16 +3163,16 @@ int sg) // returns the number of stored characters for a font size
     return ret;
 }
 
-unsigned char* LTDSFile::getBuchstaben(
+unsigned char* LTDSFile::getCharacters(
 int sg) // returns an array of characters for a font size
 {
     if (!FileExists(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
     unsigned char* ret = 0;
-    unsigned char* groessen = dateiKopf->getSchriftGroesseList();
-    unsigned char granzahl = dateiKopf->getSchriftGroesseAnzahl();
+    unsigned char* groessen = dateiKopf->getFontSizeList();
+    unsigned char sizeCount = dateiKopf->getFontSizeCount();
     int grpos = -1;
-    for (int i = 0; i < granzahl; ++i)
+    for (int i = 0; i < sizeCount; ++i)
     {
         if (groessen[i] == sg)
         {
@@ -3187,11 +3187,11 @@ int sg) // returns an array of characters for a font size
         std::ifstream* inF
             = new std::ifstream(pfad->getText(), std::ios::binary);
         inF->seekg(grposlist[grpos], std::ios::beg);
-        sgkpf->laden(inF);
-        int anz = sgkpf->getZeichenAnzahl();
+        sgkpf->load(inF);
+        int anz = sgkpf->getCharCount();
         ret = new unsigned char[anz];
         for (int i = 0; i < anz; ++i)
-            ret[i] = sgkpf->getZeichen()[i];
+            ret[i] = sgkpf->getChar()[i];
         sgkpf->release();
         inF->close();
         delete inF;

FileSystem.h

@@ -51,9 +51,9 @@ namespace Framework
         unsigned char G;        //! Green
         unsigned char B;        //! Blue
         unsigned char A;        //! Alpha
-        bool addBitZuFarbe(
+        bool addBitZuColor(
             unsigned char bit); //! Adds a bit to the color values
-        bool getNextFarbeBit(
+        bool getNextColorBit(
             char& byte, int i); //! Stores the next color bit in byte
 
     public:
@@ -71,9 +71,9 @@ namespace Framework
         DLLEXPORT char addByte(char byte, char begin);
         //! For saving. Sets the color to be stored in the pixel
         //! \param f The color to store
-        DLLEXPORT void setFarbe(int f);
+        DLLEXPORT void setColor(int f);
         //! Compresses the pixel. Must be called before saving.
-        DLLEXPORT void komprimieren();
+        DLLEXPORT void compress();
         //! Returns a part of the bits that represent the pixel
         //! \param byte A reference to the byte to be saved next
         //! \param begin The index of the first bit in the byte where the pixel
@@ -81,7 +81,7 @@ namespace Framework
         //! -1 if the pixel must continue in the next byte
         DLLEXPORT char getNextByte(char& byte, int begin);
         //! Returns the color value of the pixel
-        DLLEXPORT int zuFarbe() const;
+        DLLEXPORT int toColor() const;
         //! Returns whether the red component changed compared to the previous pixel
         DLLEXPORT bool getChangeR() const;
         //! Returns whether the green component changed compared to the previous pixel
@@ -109,7 +109,7 @@ namespace Framework
     private:
         RCArray<Text>* bilder;
         Array<__int64>* pos;
-        int bAnzahl;
+        int bCount;
 
     public:
         //! Constructor
@@ -137,11 +137,11 @@ 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(ProgressBar* f, std::ifstream* inF);
+        DLLEXPORT void load(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.
-        DLLEXPORT void speichern(std::ofstream* outF) const;
+        DLLEXPORT void save(std::ofstream* outF) const;
         //! Returns the name of a specific image
         //! \param i The index of the image whose name should be returned
         //! \return The name of the image
@@ -163,7 +163,7 @@ namespace Framework
         //! \return -1 if the image was not found
         DLLEXPORT int getImageIndex(Text* txt) const;
         //! Returns the number of images in the file
-        DLLEXPORT int getbAnzahl() const;
+        DLLEXPORT int getBCount() const;
         //! Returns a list of images in the file without increased reference
         //! counter. The list should not be modified
         DLLEXPORT RCArray<Text>* zImageListe() const;
@@ -183,16 +183,16 @@ namespace Framework
         //! Loads information about an image
         //! \param f The opened ifstream of the LTDB file pointing to the
         //! correct position
-        DLLEXPORT void laden(std::ifstream* f);
+        DLLEXPORT void load(std::ifstream* f);
         //! Sets the information to be stored
-        //! \param titel The title of the image
+        //! \param title The title of the image
         //! \param size The size of the image
         //! \return The number of characters from the title that cannot be
         //! stored in the LTDB file format. Only a-z, A-Z, ae ue oe ss,
         //! AE UE OE and . are allowed. All uppercase letters in the title
         //! are converted to lowercase
-        DLLEXPORT int Init(Text* titel, const Punkt& size);
-        //! Loads information from loaded bits. Used by the laden(
+        DLLEXPORT int Init(Text* title, const Point& size);
+        //! Loads information from loaded bits. Used by the load(
         //! std::ifstream) function. \param BeginBit The index of the first
         //! bit to evaluate \param EndBit The index of the last bit that
         //! should not be evaluated anymore \param bits The bits from which
@@ -203,13 +203,13 @@ namespace Framework
         //! Saves the information to a file
         //! \param f The opened ofstream of the LTDB file pointing to the
         //! correct position
-        DLLEXPORT void speichern(std::ofstream* f) const;
+        DLLEXPORT void save(std::ofstream* f) const;
         //! Returns the length of the title
         DLLEXPORT int getTitelLength() const;
         //! Returns the title of the image
         DLLEXPORT Text* getTitel() const;
         //! Returns the size of the image
-        DLLEXPORT Punkt getSize() const;
+        DLLEXPORT Point getSize() const;
         //! Returns the next bits to be saved
         //! \param begin The index of the first bit to save into
         //! \param end The index of the last bit to save into
@@ -222,7 +222,7 @@ namespace Framework
     class LTDBBody : public virtual ReferenceCounter
     {
     private:
-        Punkt gr;
+        Point gr;
         Image* b;
         int dateiSize;
 
@@ -245,7 +245,7 @@ namespace Framework
         //! \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(ProgressBar* zF, std::ifstream* inF);
+        DLLEXPORT void load(ProgressBar* zF, std::ifstream* inF);
         //! Sets the image to be saved
         //! \param b The image to save
         DLLEXPORT void setImage(Image* b);
@@ -253,11 +253,11 @@ 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(ProgressBar* zF, std::ofstream* outF) const;
+        DLLEXPORT void save(ProgressBar* zF, std::ofstream* outF) const;
         //! Returns the loaded image
         DLLEXPORT Image* getImage() const;
         //! Returns the size of the image
-        DLLEXPORT const Punkt& getSize() const;
+        DLLEXPORT const Point& getSize() const;
     };
 
     //! Manages an LTDB file
@@ -276,11 +276,11 @@ namespace Framework
         //! \param pfad The path
         DLLEXPORT void setFile(Text* pfad);
         //! Creates a new LTDB file
-        DLLEXPORT void erstellen();
+        DLLEXPORT void create();
         //! 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(ProgressBar* zF);
+        DLLEXPORT void readData(ProgressBar* zF);
         //! Deletes the LTDB file
         DLLEXPORT void remove();
         //! Deletes an image from the LTDB file
@@ -291,23 +291,23 @@ namespace Framework
         //! \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(ProgressBar* zF, Text* name);
+        DLLEXPORT Image* load(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(ProgressBar* zF, Image* bild, Text* name);
+        DLLEXPORT int save(ProgressBar* zF, Image* bild, Text* name);
         //! Returns a list of stored images.
         //! The list should not be modified
         DLLEXPORT RCArray<Text>* zImageListe();
         //! Returns the path to the LTDB file
         DLLEXPORT Text* getPfad() const;
         //! Returns the number of images in the LTDB file
-        DLLEXPORT int getImageAnzahl() const;
+        DLLEXPORT int getImageCount() const;
         //! Checks whether the LTDB file exists
-        DLLEXPORT bool istOffen() const;
+        DLLEXPORT bool isOpen() const;
     };
 
 #ifdef WIN32
@@ -326,9 +326,9 @@ namespace Framework
         unsigned char komp : 3; //! Compression of the color values
         unsigned char alpha;
         LTDSPixel* davor;
-        bool addBitZuFarbe(
+        bool addBitZuColor(
             unsigned char bit); //! Adds a bit to the color values
-        bool getNextFarbeBit(
+        bool getNextColorBit(
             char& byte, int i); //! Stores the next color bit in byte
 
     public:
@@ -380,7 +380,7 @@ namespace Framework
         //! Loads the header from the LTDS file
         //! \param inF The opened ifstream of the LTDS file pointing to the
         //! correct position
-        DLLEXPORT void laden(std::ifstream* inF);
+        DLLEXPORT void load(std::ifstream* inF);
         //! Adds a font size
         //! \param sg The font size to add
         DLLEXPORT void addSG(char sg);
@@ -390,15 +390,15 @@ namespace Framework
         //! Saves the LTDS header to the file
         //! \param outF The opened ofstream of the LTDS file pointing to the
         //! correct position
-        DLLEXPORT void speichern(std::ofstream* outF) const;
+        DLLEXPORT void save(std::ofstream* outF) const;
         //! Returns an array of stored font sizes.
         //! The array should not be modified
-        DLLEXPORT unsigned char* getSchriftGroesseList() const;
+        DLLEXPORT unsigned char* getFontSizeList() const;
         //! Returns an array with positions of the first bytes for each
         //! font size in the file
         DLLEXPORT int* getPositionList() const;
         //! Returns the number of stored font sizes
-        DLLEXPORT int getSchriftGroesseAnzahl() const;
+        DLLEXPORT int getFontSizeCount() const;
     };
 
     //! The header of a font size. Contains information about the
@@ -406,7 +406,7 @@ namespace Framework
     class LTDSFontHeader : public virtual ReferenceCounter
     {
     private:
-        unsigned char schriftSize;
+        unsigned char fontSize;
         unsigned char* zeichen;
         int* pos;
         unsigned char zeichenAnzahl;
@@ -419,33 +419,33 @@ namespace Framework
         //! Loads the header of a font size from the file
         //! \param inF The opened ifstream of the LTDS file pointing to the
         //! correct position
-        DLLEXPORT void laden(std::ifstream* inF);
+        DLLEXPORT void load(std::ifstream* inF);
         //! Sets the font size. For saving
         //! \param gr The font size
-        DLLEXPORT void setSchriftgroesse(unsigned char gr);
+        DLLEXPORT void setFontSize(unsigned char gr);
         //! Sets the alphabet to be stored in the font size
         //! \param alphabet The alphabet containing all characters to store
         //! in the font size
-        DLLEXPORT void setZeichenAlphabet(Alphabet* alphabet);
+        DLLEXPORT void setCharAlphabet(Alphabet* alphabet);
         //! Adds a character to the font size to be stored
         //! \param zeichen The ASCII code of the character to add
-        DLLEXPORT void addZeichen(unsigned char zeichen);
+        DLLEXPORT void addChar(unsigned char zeichen);
         //! Deletes a character from the font size
         //! \param zeich The ASCII code of the character to delete
-        DLLEXPORT void removeZeichen(unsigned char zeich);
+        DLLEXPORT void removeChar(unsigned char zeich);
         //! Saves the font size header to the LTDS file
         //! \param outF The opened ofstream of the LTDS file pointing to the
         //! correct position
-        DLLEXPORT void speichern(std::ofstream* outF) const;
+        DLLEXPORT void save(std::ofstream* outF) const;
         //! Returns the font size this header belongs to
-        DLLEXPORT unsigned char getSchriftGroesse() const;
+        DLLEXPORT unsigned char getFontSize() const;
         //! Returns the number of characters stored in the font size
-        DLLEXPORT unsigned char getZeichenAnzahl() const;
+        DLLEXPORT unsigned char getCharCount() const;
         //! Returns an array with the positions of the first bytes of the
         //! stored characters in the LTDS file
         DLLEXPORT int* getPositionen() const;
         //! Returns an array with the ASCII codes of the stored characters
-        DLLEXPORT unsigned char* getZeichen() const;
+        DLLEXPORT unsigned char* getChar() const;
     };
 
     //! The header of a single character from the LTDS file. Contains
@@ -454,7 +454,7 @@ namespace Framework
     {
     private:
         unsigned char zeichen;
-        Punkt size;
+        Point size;
 
     public:
         //! Constructor
@@ -462,11 +462,11 @@ namespace Framework
         //! Loads the data from the LTDS file
         //! \param inF The opened ifstream of the LTDS file pointing to the
         //! correct position
-        DLLEXPORT void laden(std::ifstream* inF);
+        DLLEXPORT void load(std::ifstream* inF);
         //! Sets the data to be saved.
         //! \param zeichen The ASCII code of the character
         //! \param groesse The size of the character in pixels
-        DLLEXPORT void init(unsigned char zeichen, const Punkt& groesse);
+        DLLEXPORT void init(unsigned char zeichen, const Point& groesse);
         //! Sets the data to be saved.
         //! \param zeichen The ASCII code of the character
         //! \param br The width of the character in pixels
@@ -475,22 +475,22 @@ namespace Framework
         //! Saves the data to the LTDS file
         //! \param outF The opened ofstream of the LTDS file pointing to the
         //! correct position
-        DLLEXPORT void speichern(std::ofstream* outF) const;
+        DLLEXPORT void save(std::ofstream* outF) const;
         //! Returns the ASCII code of the character
-        DLLEXPORT unsigned char getZeichen() const;
+        DLLEXPORT unsigned char getChar() const;
         //! Returns the width of the character in pixels
-        DLLEXPORT int getBreite() const;
+        DLLEXPORT int getWidth() const;
         //! Returns the height of the character in pixels
-        DLLEXPORT int getHoehe() const;
+        DLLEXPORT int getHeight() const;
         //! Returns the size of the character in pixels
-        DLLEXPORT const Punkt& getGroesse() const;
+        DLLEXPORT const Point& getSize() const;
     };
 
     //! Manages the pixel data of a character
     class LTDSCharacterBody : public virtual ReferenceCounter
     {
     private:
-        Punkt size;
+        Point size;
         unsigned char zeichen;
         Character* buchstabe;
 
@@ -506,15 +506,15 @@ namespace Framework
         //! Loads the pixels from the LTDS file
         //! \param inF The opened ifstream of the LTDS file pointing to the
         //! correct position
-        DLLEXPORT void laden(std::ifstream * inF);
+        DLLEXPORT void load(std::ifstream * inF);
         //! Saves the pixels to the LTDS file
         //! \param outF The opened ofstream of the LTDS file pointing to the
         //! correct position
-        DLLEXPORT void speichern(std::ofstream * outF) const;
+        DLLEXPORT void save(std::ofstream * outF) const;
         //! Returns the loaded character
         DLLEXPORT Character* getCharacter() const;
         //! Returns the ASCII code of the character
-        DLLEXPORT unsigned char getZeichen() const;
+        DLLEXPORT unsigned char getChar() const;
     };
 
     //! Manages an LTDS file
@@ -534,61 +534,61 @@ namespace Framework
         DLLEXPORT void setPfad(Text* txt);
         //! Loads important information from the file. Must be called before
         //! using the file
-        DLLEXPORT void leseDaten();
+        DLLEXPORT void readData();
         //! Adds a font size to the file if it does not already exist
         //! \param alphabet The alphabet containing the characters in the
         //! desired font size
-        DLLEXPORT void addSchriftgroesse(Alphabet* alphabet);
+        DLLEXPORT void addFontSize(Alphabet* alphabet);
         //! Adds a character to a font size
         //! \param gr The font size of the character
         //! \param zeich The character to save
         //! \param zeichen The ASCII code of the character
-        DLLEXPORT void addBuchstabe(
+        DLLEXPORT void addCharacter(
             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);
+        DLLEXPORT void deleteFontSize(int gr);
         //! Deletes a character from a font size
         //! \param gr The font size from which the character should be removed
         //! \param zeichen The ASCII code of the character to delete
-        DLLEXPORT void loescheBuchstabe(int gr, unsigned char zeichen);
+        DLLEXPORT void deleteCharacter(int gr, unsigned char zeichen);
         //! Deletes the LTDS file
         DLLEXPORT void deleteFile();
         //! Creates the LTDS file
         DLLEXPORT void createFile();
         //! Saves an entire font to the file
-        //! \param schrift The font to save
-        DLLEXPORT void saveFont(Font* schrift);
+        //! \param font The font to save
+        DLLEXPORT void saveFont(Font* font);
         //! Loads the entire font from the file
         //! \return The loaded font. 0 if an error occurred while loading
         DLLEXPORT Font* loadFont();
         //! Loads a single font size from the file
-        //! \param schriftgroesse The font size to load
+        //! \param fontgroesse The font size to load
         //! \return An alphabet with the characters in the font size. 0 if
         //! the font size was not found
-        DLLEXPORT Alphabet* ladeAlphabet(int schriftgroesse);
+        DLLEXPORT Alphabet* loadAlphabet(int fontgroesse);
         //! Loads a specific character of a specific font size
-        //! \param schriftgroesse The font size the character belongs to
+        //! \param fontgroesse 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 Character* loadCharacter(
-            int schriftgroesse, unsigned char zeichen);
+            int fontgroesse, unsigned char zeichen);
         //! Returns the path to the LTDS file
         DLLEXPORT Text* getPfad() const;
         //! Returns the number of stored font sizes
-        DLLEXPORT int getAnzahlSchriftgroessen() const;
+        DLLEXPORT int getFontSizeCount() const;
         //! Returns an array with the stored font sizes.
         //! The array should not be modified
-        DLLEXPORT unsigned char* getSchriftGroessen() const;
+        DLLEXPORT unsigned char* getFontSizes() const;
         //! Returns the number of stored characters in a font size
         //! \param sg The font size for which the number of characters
         //! should be determined \return The number of characters.
-        DLLEXPORT unsigned char getAnzahlBuchstaben(int sg);
+        DLLEXPORT unsigned char getCharacterCount(int sg);
         //! Returns an array with characters of a specific font size
         //! \param sg The font size
         //! \return The array with the ASCII codes of the characters. 0 if the
         //! font size was not found.
-        DLLEXPORT unsigned char* getBuchstaben(int sg);
+        DLLEXPORT unsigned char* getCharacters(int sg);
     };
 #endif
     //! Bit functions

Font.cpp

@@ -17,7 +17,7 @@ Character::Character()
     : ReferenceCounter(),
       size(0, 0),
       alpha(0),
-      schriftSize(0)
+      fontSize(0)
 {}
 
 // Destructor
@@ -27,7 +27,7 @@ Character::~Character()
 }
 
 // non-constant
-void Character::NewCharacter(Punkt& size) // Initialization
+void Character::NewCharacter(Point& size) // Initialization
 {
     this->size = size;
     if (alpha) delete[] alpha;
@@ -36,7 +36,7 @@ void Character::NewCharacter(Punkt& size) // Initialization
 }
 
 void Character::setPixel(
-    Punkt& pos, unsigned char alpha) // sets the alpha value of the pixel
+    Point& pos, unsigned char alpha) // sets the alpha value of the pixel
 {
     this->alpha[pos.x + pos.y * size.x] = alpha;
 }
@@ -51,23 +51,23 @@ void Character::setPixel(int i, unsigned char alpha)
     this->alpha[i] = alpha;
 }
 
-void Character::setSchriftSize(int sg) // sets the font size of the character
+void Character::setFontSize(int sg) // sets the font size of the character
 {
-    schriftSize = sg;
+    fontSize = sg;
 }
 
-int Character::getSchriftSize() const
+int Character::getFontSize() const
 {
-    return schriftSize;
+    return fontSize;
 }
 
 // constant
-const Punkt& Character::getSize() const // returns the character image size
+const Point& Character::getSize() const // returns the character image size
 {
     return size;
 }
 
-int Character::getBreite() const // character width
+int Character::getWidth() const // character width
 {
     return size.x;
 }
@@ -87,7 +87,7 @@ unsigned char* Character::getBuff() const // returns the alpha buffer
 Alphabet::Alphabet()
     : ReferenceCounter(),
       zeichen(new Character*[256]),
-      schriftSize(12)
+      fontSize(12)
 {
     for (int i = 0; i < 256; ++i)
         zeichen[i] = 0;
@@ -121,16 +121,16 @@ void Alphabet::setCharacter(
     zeichen[i] = buchstabe;
     if (zeichen[i])
     {
-        zeichen[i]->setSchriftSize(schriftSize);
+        zeichen[i]->setFontSize(fontSize);
     }
 }
 
-void Alphabet::setSchriftSize(int gr) // sets the font size
+void Alphabet::setFontSize(int gr) // sets the font size
 {
-    schriftSize = gr;
+    fontSize = gr;
     for (int i = 0; i < 256; ++i)
     {
-        if (zeichen[i]) zeichen[i]->setSchriftSize(gr);
+        if (zeichen[i]) zeichen[i]->setFontSize(gr);
     }
 }
 
@@ -147,14 +147,14 @@ Character* Alphabet::zCharacter(unsigned char i) const
     return zeichen[i];
 }
 
-bool Alphabet::hatBuchstabe(unsigned char b) const
+bool Alphabet::hasCharacter(unsigned char b) const
 {
     return zeichen[b] != 0;
 }
 
-int Alphabet::getSchriftSize() const // returns the font size
+int Alphabet::getFontSize() const // returns the font size
 {
-    return schriftSize;
+    return fontSize;
 }
 
 // Contents of the AlphabetArray class from Font.h
@@ -167,12 +167,12 @@ AlphabetArray::AlphabetArray()
 // non-constant
 bool AlphabetArray::addAlphabet(Alphabet* alphabet) // Adds an alphabet
 {
-    if (alphabets[alphabet->getSchriftSize()] != 0)
+    if (alphabets[alphabet->getFontSize()] != 0)
     {
         alphabet->release();
         return 0;
     }
-    alphabets[alphabet->getSchriftSize()] = alphabet;
+    alphabets[alphabet->getFontSize()] = alphabet;
     return 1;
 }
 
@@ -205,7 +205,7 @@ Alphabet* AlphabetArray::zAlphabet(
 // Constructor
 Font::Font()
     : ReferenceCounter(),
-      alphabetAnzahl(0),
+      alphabetCount(0),
       alphabet(new AlphabetArray())
 {}
 
@@ -220,7 +220,7 @@ bool Font::addAlphabet(
 {
     if (this->alphabet->addAlphabet(alphabet))
     {
-        ++alphabetAnzahl;
+        ++alphabetCount;
         return true;
     }
     return false;
@@ -228,7 +228,7 @@ bool Font::addAlphabet(
 
 void Font::removeAlphabet(unsigned char sg) // Removes an alphabet
 {
-    if (alphabet->removeAlphabet(sg)) --alphabetAnzahl;
+    if (alphabet->removeAlphabet(sg)) --alphabetCount;
 }
 
 // constant
@@ -276,24 +276,24 @@ Alphabet* Font::zAlphabet(unsigned char sg) const
     return drawAlphabet;
 }
 
-unsigned char Font::getAlphabetAnzahl()
+unsigned char Font::getAlphabetCount()
     const // returns the number of alphabets contained in the font
 {
-    return alphabetAnzahl;
+    return alphabetCount;
 }
 
 TextRenderer::TextRenderer()
     : TextRenderer(0)
 {}
 
-TextRenderer::TextRenderer(Font* schrift)
+TextRenderer::TextRenderer(Font* font)
     : ReferenceCounter()
 {
-    s = schrift;
+    s = font;
     zeilenAbstand = 5;
     zeichenAbstand = 0;
-    schriftSize = 0;
-    setSchriftSize(12);
+    fontSize = 0;
+    setFontSize(12);
 }
 
 TextRenderer::~TextRenderer()
@@ -301,29 +301,29 @@ TextRenderer::~TextRenderer()
     if (s) s->release();
 }
 
-void TextRenderer::setFontZ(Font* schrift)
+void TextRenderer::setFontZ(Font* font)
 {
-    if (s != schrift)
+    if (s != font)
     {
         if (s) s->release();
-        s = schrift;
+        s = font;
         memset(charWidths, 0, sizeof(charWidths));
         memset(charHeights, 0, sizeof(charHeights));
         if (s)
         {
-            Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
+            Alphabet* a = s->zAlphabet((unsigned char)fontSize);
             for (int i = 0; i < 256; i++)
             {
                 Character* b = a->zCharacter((unsigned char)i);
                 if (b)
                 {
                     charWidths[i]
-                        = (int)((b->getBreite() / (double)a->getSchriftSize())
-                                    * schriftSize
+                        = (int)((b->getWidth() / (double)a->getFontSize())
+                                    * fontSize
                                 + 0.5);
                     charHeights[i]
-                        = (int)((b->getHeight() / (double)a->getSchriftSize())
-                                    * schriftSize
+                        = (int)((b->getHeight() / (double)a->getFontSize())
+                                    * fontSize
                                 + 0.5);
                 }
                 else
@@ -336,7 +336,7 @@ void TextRenderer::setFontZ(Font* schrift)
     }
     else
     {
-        schrift->release();
+        font->release();
     }
 }
 
@@ -354,28 +354,28 @@ Font* TextRenderer::zFont()
 // Sets the font size to draw with. The font automatically selects the
 // appropriate alphabet for drawing
 //  sg: The font size
-void TextRenderer::setSchriftSize(int sg)
+void TextRenderer::setFontSize(int sg)
 {
-    if (schriftSize != sg)
+    if (fontSize != sg)
     {
-        schriftSize = sg;
+        fontSize = sg;
         memset(charWidths, 0, sizeof(charWidths));
         memset(charHeights, 0, sizeof(charHeights));
         if (s)
         {
-            Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
+            Alphabet* a = s->zAlphabet((unsigned char)fontSize);
             for (int i = 0; i < 256; i++)
             {
                 Character* b = a->zCharacter((unsigned char)i);
                 if (b)
                 {
                     charWidths[i]
-                        = (int)((b->getBreite() / (double)a->getSchriftSize())
-                                    * schriftSize
+                        = (int)((b->getWidth() / (double)a->getFontSize())
+                                    * fontSize
                                 + 0.5);
                     charHeights[i]
-                        = (int)((b->getHeight() / (double)a->getSchriftSize())
-                                    * schriftSize
+                        = (int)((b->getHeight() / (double)a->getFontSize())
+                                    * fontSize
                                 + 0.5);
                 }
                 else
@@ -390,22 +390,22 @@ void TextRenderer::setSchriftSize(int sg)
 
 // Sets the line spacing to use for drawing
 //  za: The line spacing to the bottom of the line above in pixels
-void TextRenderer::setZeilenAbstand(int za)
+void TextRenderer::setLineSpacing(int za)
 {
     zeilenAbstand = za;
 }
 
 // Sets the character spacing to use for drawing
 //  za: The character spacing in pixels
-void TextRenderer::setZeichenAbstand(int za)
+void TextRenderer::setCharSpacing(int za)
 {
     zeichenAbstand = za;
 }
 
 // Inserts line breaks into the text so it is fully displayed at a given width
 //  zText: The text to insert line breaks into
-//  maxBreite: The width in pixels at which the text should be fully displayed
-void TextRenderer::textFormatieren(Text* zTxt, int maxBreite)
+//  maxWidth: The width in pixels at which the text should be fully displayed
+void TextRenderer::formatText(Text* zTxt, int maxWidth)
 {
     int lastPos = -1;
     int x = 0;
@@ -417,13 +417,13 @@ void TextRenderer::textFormatieren(Text* zTxt, int maxBreite)
         if (txt[i] == ' ')
         {
             lastPos = i;
-            x += schriftSize / 2 + zeichenAbstand;
+            x += fontSize / 2 + zeichenAbstand;
             continue;
         }
         if (txt[i] == '\t')
         {
             lastPos = i;
-            x += schriftSize + zeichenAbstand;
+            x += fontSize + zeichenAbstand;
             continue;
         }
         if (txt[i] == '\n')
@@ -433,9 +433,9 @@ void TextRenderer::textFormatieren(Text* zTxt, int maxBreite)
             continue;
         }
         x += getCharWidth(txt[i]) + zeichenAbstand;
-        if (x > maxBreite && lastPos > -1)
+        if (x > maxWidth && lastPos > -1)
         {
-            result.ersetzen(lastPos, lastPos + 1, "\n");
+            result.replace(lastPos, lastPos + 1, "\n");
             x = 0;
             i = lastPos;
             lastPos = -1;
@@ -445,7 +445,7 @@ void TextRenderer::textFormatieren(Text* zTxt, int maxBreite)
 }
 
 // Draws a specific text with cursor and coloring onto an image
-// Use (setPosition) and (setDrawSchriftGroesse) to change position and size
+// Use (setPosition) and (setDrawFontGroesse) to change position and size
 //  x: x position of the first character
 //  y: y position of the first character
 //  txt: The text to draw
@@ -468,12 +468,12 @@ void TextRenderer::renderText(int x,
 {
     if (!s) return;
     if (fbeg == -1) fbeg = cpos;
-    int zRObjBr = zRObj.getBreite();
+    int zRObjBr = zRObj.getWidth();
     int zRObjHi = zRObj.getHeight();
-    const Punkt& zRObjOff = zRObj.getDrawOff();
+    const Point& zRObjOff = zRObj.getDrawOff();
     int beginX = x;
-    int zh = getZeilenHeight();
-    if (y + (zh + zeilenAbstand) * Text(txt).anzahlVon('\n') + zh + zRObjOff.y
+    int zh = getRowHeight();
+    if (y + (zh + zeilenAbstand) * Text(txt).countOf('\n') + zh + zRObjOff.y
             < 0
         || x + zRObjOff.x >= zRObjBr || y + zRObjOff.y >= zRObjHi)
         return;
@@ -484,22 +484,22 @@ void TextRenderer::renderText(int x,
         if (i == fbeg) faerb = !faerb;
         if (i == cpos)
         {
-            zRObj.drawLinieVAlpha(x, y, zh, cf);
+            zRObj.drawLineVAlpha(x, y, zh, cf);
             faerb = !faerb;
         }
         if (txt[i] == ' ')
         {
             if (faerb)
                 zRObj.alphaRegion(
-                    x, y, schriftSize / 2 + zeichenAbstand, zh, ff);
-            x += schriftSize / 2 + zeichenAbstand;
+                    x, y, fontSize / 2 + zeichenAbstand, zh, ff);
+            x += fontSize / 2 + zeichenAbstand;
             continue;
         }
         if (txt[i] == '\t')
         {
             if (faerb)
-                zRObj.alphaRegion(x, y, schriftSize + zeichenAbstand, zh, ff);
-            x += schriftSize + zeichenAbstand;
+                zRObj.alphaRegion(x, y, fontSize + zeichenAbstand, zh, ff);
+            x += fontSize + zeichenAbstand;
             continue;
         }
         if (txt[i] == '\n')
@@ -510,11 +510,11 @@ void TextRenderer::renderText(int x,
         }
         renderChar(x, y, txt[i], zRObj, f(x, y, i), 0, faerb, ff);
     }
-    if (textLength(txt) == cpos) zRObj.drawLinieVAlpha(x, y, zh, cf);
+    if (textLength(txt) == cpos) zRObj.drawLineVAlpha(x, y, zh, cf);
 }
 
 // Draws a specific text with cursor and coloring onto an image
-// Use (setPosition) and (setDrawSchriftGroesse) to change position and size
+// Use (setPosition) and (setDrawFontGroesse) to change position and size
 //  x: x position of the first character
 //  y: y position of the first character
 //  txt: The text to draw
@@ -548,7 +548,7 @@ void TextRenderer::renderText(int x,
 }
 
 // Draws a specific character with coloring onto an image
-// Use (setPosition) and (setDrawSchriftGroesse) to change position and size
+// Use (setPosition) and (setDrawFontGroesse) to change position and size
 //  x: x position of the first character
 //  y: y position of the first character
 //  txt: The text to draw
@@ -567,12 +567,12 @@ void TextRenderer::renderChar(int& x,
     int selectedBackgroundColor)
 {
     if (!s) return;
-    Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
+    Alphabet* a = s->zAlphabet((unsigned char)fontSize);
     if (!a) return;
     Character* b = a->zCharacter(c);
     if (b)
     {
-        if (x >= zRObj.getBreite()) return;
+        if (x >= zRObj.getWidth()) return;
         if (zRObj.isAreaDrawable(x, y, getCharWidth(c), getCharHeight(c)))
         {
             if (selected)
@@ -581,22 +581,22 @@ void TextRenderer::renderChar(int& x,
                 zRObj.alphaRegion(x,
                     y,
                     br,
-                    getZeilenHeight() + zeilenAbstand,
+                    getRowHeight() + zeilenAbstand,
                     selectedBackgroundColor);
             }
             if (b->getBuff())
             {
-                const Punkt& zRObjGr = zRObj.getDrawGr();
-                const Punkt& zRObjPos = zRObj.getDrawPos();
-                const Punkt& zRObjOff = zRObj.getDrawOff();
+                const Point& zRObjGr = zRObj.getDrawGr();
+                const Point& zRObjPos = zRObj.getDrawPos();
+                const Point& zRObjOff = zRObj.getDrawOff();
                 int xp = x + zRObjOff.x, yp = y + zRObjOff.y;
                 int xs = xp < zRObjPos.x ? (zRObjPos.x - xp) : 0,
                     ys = yp < zRObjPos.y ? (zRObjPos.y - yp) : 0;
-                int br = b->getBreite();
+                int br = b->getWidth();
                 unsigned char a2 = (unsigned char)(255 - (color >> 24));
                 color &= 0x00FFFFFF;
-                float xoff = (float)b->getSchriftSize() / (float)schriftSize,
-                      yoff = (float)b->getSchriftSize() / (float)schriftSize;
+                float xoff = (float)b->getFontSize() / (float)fontSize,
+                      yoff = (float)b->getFontSize() / (float)fontSize;
                 float x = (float)xs * xoff, y = (float)ys * yoff;
                 int maxX = getCharWidth(c), maxY = getCharHeight(c);
                 maxX = (xp + maxX) >= zRObjGr.x ? (zRObjGr.x - xp) : maxX;
@@ -606,7 +606,7 @@ void TextRenderer::renderChar(int& x,
                 {
                     for (int dy = ys; dy < maxY; ++dy)
                     {
-                        ygr2 = (yp + dy) * zRObj.getBreite() + xp;
+                        ygr2 = (yp + dy) * zRObj.getWidth() + xp;
                         ygr = (int)y * br;
                         for (dx = xs; dx < maxX; ++dx)
                         {
@@ -622,7 +622,7 @@ void TextRenderer::renderChar(int& x,
                 {
                     for (int dy = ys; dy < maxY; ++dy)
                     {
-                        ygr2 = (yp + dy) * zRObj.getBreite() + xp;
+                        ygr2 = (yp + dy) * zRObj.getWidth() + xp;
                         ygr = (int)y * br;
                         for (dx = xs; dx < maxX; ++dx)
                         {
@@ -636,8 +636,8 @@ void TextRenderer::renderChar(int& x,
                 }
             }
             if (underlined)
-                zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                    y + getZeilenHeight() + getZeichenAbstand() / 2,
+                zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                    y + getRowHeight() + getCharSpacing() / 2,
                     getCharWidth(c) + (int)(zeichenAbstand / 2.0 + 0.5),
                     0xFF000000 | color);
         }
@@ -648,50 +648,50 @@ void TextRenderer::renderChar(int& x,
         if (selected)
             zRObj.alphaRegion(x,
                 y,
-                schriftSize / 2 + zeichenAbstand,
-                getZeilenHeight() + zeilenAbstand,
+                fontSize / 2 + zeichenAbstand,
+                getRowHeight() + zeilenAbstand,
                 selectedBackgroundColor);
         if (underlined)
-            zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                y + getZeilenHeight() + getZeichenAbstand() / 2,
-                schriftSize / 2 + zeichenAbstand
+            zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                y + getRowHeight() + getCharSpacing() / 2,
+                fontSize / 2 + zeichenAbstand
                     + (int)(zeichenAbstand / 2.0 + 0.5),
                 0xFF000000 | color);
-        x += schriftSize / 2 + zeichenAbstand;
+        x += fontSize / 2 + zeichenAbstand;
     }
     else if (c == '\t')
     {
         if (selected)
             zRObj.alphaRegion(x,
                 y,
-                schriftSize + zeichenAbstand,
-                getZeilenHeight() + zeilenAbstand,
+                fontSize + zeichenAbstand,
+                getRowHeight() + zeilenAbstand,
                 selectedBackgroundColor);
         if (underlined)
-            zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                y + getZeilenHeight() + getZeichenAbstand() / 2,
-                schriftSize + zeichenAbstand
+            zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                y + getRowHeight() + getCharSpacing() / 2,
+                fontSize + zeichenAbstand
                     + (int)(zeichenAbstand / 2.0 + 0.5),
                 0xFF000000 | color);
-        x += schriftSize + zeichenAbstand;
+        x += fontSize + zeichenAbstand;
     }
 }
 
 // Returns the font size used for drawing
-int TextRenderer::getSchriftSize() const
+int TextRenderer::getFontSize() const
 {
-    return schriftSize;
+    return fontSize;
 }
 
 // Returns the character spacing in pixels on the x axis
-int TextRenderer::getZeichenAbstand() const
+int TextRenderer::getCharSpacing() const
 {
     return zeichenAbstand;
 }
 
 // Determines how many pixels are needed to fully display a specific text
 //  txt: The text whose width in pixels should be determined
-int TextRenderer::getTextBreite(const char* txt) const
+int TextRenderer::getTextWidth(const char* txt) const
 {
     int ret = 0;
     int tmp = 0;
@@ -714,8 +714,8 @@ int TextRenderer::getTextBreite(const char* txt) const
 //  txt: The text whose height in pixels should be determined
 int TextRenderer::getTextHeight(const char* txt) const
 {
-    int hi = getZeilenHeight();
-    return hi + ((hi + zeilenAbstand) * Text(txt).anzahlVon('\n'));
+    int hi = getRowHeight();
+    return hi + ((hi + zeilenAbstand) * Text(txt).countOf('\n'));
 }
 
 // Determines how many pixels are needed to fully display a specific character
@@ -723,9 +723,9 @@ int TextRenderer::getTextHeight(const char* txt) const
 int TextRenderer::getCharWidth(const char c) const
 {
     if (c == '\t')
-        return schriftSize;
+        return fontSize;
     else if (c == ' ')
-        return schriftSize / 2;
+        return fontSize / 2;
     else
         return charWidths[(unsigned char)c];
 }
@@ -748,13 +748,13 @@ int TextRenderer::getCharHeight(const char c) const
 }
 
 // Returns the line spacing in pixels to the bottom of the line above
-int TextRenderer::getZeilenAbstand() const
+int TextRenderer::getLineSpacing() const
 {
     return zeilenAbstand;
 }
 
 // Returns the scaled height needed by a drawn line in pixels
-int TextRenderer::getZeilenHeight() const
+int TextRenderer::getRowHeight() const
 {
     int zh = 0;
     for (int i = 0; i < 256; ++i)
@@ -766,16 +766,16 @@ int TextRenderer::getZeilenHeight() const
 
 // Determines the character in the text that the mouse points to
 //  txt: The text the mouse points to
-//  mausX: The X position of the mouse in pixels relative to the position of
+//  mouseX: The X position of the mouse in pixels relative to the position of
 //  the first character
-//  mausY: The Y position of the mouse in pixels relative to the position of
+//  mouseY: The Y position of the mouse in pixels relative to the position of
 //  the first character
-int TextRenderer::textPos(const char* txt, int mausX, int mausY) const
+int TextRenderer::textPos(const char* txt, int mouseX, int mouseY) const
 {
     int tx = 0;
     int ty = 0;
-    int sh = getZeilenHeight();
-    if (mausX < 0 || mausY < 0) return -1;
+    int sh = getRowHeight();
+    if (mouseX < 0 || mouseY < 0) return -1;
     int len = textLength(txt);
     for (int i = 0; i < len; ++i)
     {
@@ -783,24 +783,24 @@ int TextRenderer::textPos(const char* txt, int mausX, int mausY) const
         {
             ty += sh + zeilenAbstand;
             tx = 0;
-            if (mausY < ty) return i;
+            if (mouseY < ty) return i;
         }
         if (txt[i] == '\t')
         {
-            tx += schriftSize + zeichenAbstand;
+            tx += fontSize + zeichenAbstand;
         }
         else if (txt[i] == ' ')
         {
-            tx += schriftSize / 2 + zeichenAbstand;
+            tx += fontSize / 2 + zeichenAbstand;
         }
         else
         {
             tx += getCharWidth(txt[i]) + zeichenAbstand;
         }
         int txpl = getCharWidth(txt[i]) / 2;
-        if (mausX < tx - txpl && mausY < ty + sh + zeilenAbstand) return i;
+        if (mouseX < tx - txpl && mouseY < ty + sh + zeilenAbstand) return i;
     }
-    if (mausY < ty + sh + zeilenAbstand) return textLength(txt);
+    if (mouseY < ty + sh + zeilenAbstand) return textLength(txt);
     return -1;
 }
 
@@ -808,14 +808,14 @@ EngravedTextRenderer::EngravedTextRenderer()
     : EngravedTextRenderer(0)
 {}
 
-EngravedTextRenderer::EngravedTextRenderer(Font* schrift)
-    : TextRenderer(schrift)
+EngravedTextRenderer::EngravedTextRenderer(Font* font)
+    : TextRenderer(font)
 {}
 
 EngravedTextRenderer::~EngravedTextRenderer() {}
 
 // Draws a specific character with coloring onto an image
-// Use (setPosition) and (setDrawSchriftGroesse) to change position and size
+// Use (setPosition) and (setDrawFontGroesse) to change position and size
 //  x: x position of the first character
 //  y: y position of the first character
 //  txt: The text to draw
@@ -834,11 +834,11 @@ void EngravedTextRenderer::renderChar(int& x,
     int selectedBackgroundColor)
 {
     if (!s) return;
-    Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
+    Alphabet* a = s->zAlphabet((unsigned char)fontSize);
     Character* b = a->zCharacter(c);
     if (b)
     {
-        if (x >= zRObj.getBreite()) return;
+        if (x >= zRObj.getWidth()) return;
         if (zRObj.isAreaDrawable(x, y, getCharWidth(c), getCharHeight(c)))
         {
             if (selected)
@@ -847,21 +847,21 @@ void EngravedTextRenderer::renderChar(int& x,
                 zRObj.alphaRegion(x,
                     y,
                     br,
-                    getZeilenHeight() + zeilenAbstand,
+                    getRowHeight() + zeilenAbstand,
                     selectedBackgroundColor);
             }
             if (b->getBuff())
             {
-                const Punkt& zRObjGr = zRObj.getDrawGr();
-                const Punkt& zRObjPos = zRObj.getDrawPos();
-                const Punkt& zRObjOff = zRObj.getDrawOff();
+                const Point& zRObjGr = zRObj.getDrawGr();
+                const Point& zRObjPos = zRObj.getDrawPos();
+                const Point& zRObjOff = zRObj.getDrawOff();
                 int xp = x + zRObjOff.x, yp = y + zRObjOff.y;
                 int xs = xp < zRObjPos.x ? (zRObjPos.x - xp) : 0,
                     ys = yp < zRObjPos.y ? (zRObjPos.y - yp) : 0;
-                int br = b->getBreite(), h = b->getHeight();
+                int br = b->getWidth(), h = b->getHeight();
                 color &= 0x00FFFFFF;
-                double xoff = (double)b->getSchriftSize() / (schriftSize * 2.0),
-                       yoff = (double)b->getSchriftSize() / (schriftSize * 2.0);
+                double xoff = (double)b->getFontSize() / (fontSize * 2.0),
+                       yoff = (double)b->getFontSize() / (fontSize * 2.0);
                 double x = xs * xoff, y = ys * yoff;
                 int maxX = getCharWidth(c), maxY = getCharHeight(c);
                 maxX = (xp + maxX) >= zRObjGr.x ? (zRObjGr.x - xp) : maxX;
@@ -871,7 +871,7 @@ void EngravedTextRenderer::renderChar(int& x,
                 {
                     for (int dy = ys; dy < maxY; ++dy)
                     {
-                        ygr2 = (yp + dy) * zRObj.getBreite();
+                        ygr2 = (yp + dy) * zRObj.getWidth();
                         ygr = (int)y * br;
                         for (dx = xs; dx < maxX; ++dx)
                         {
@@ -905,7 +905,7 @@ void EngravedTextRenderer::renderChar(int& x,
                 {
                     for (int dy = ys; dy < maxY; ++dy)
                     {
-                        ygr2 = (yp + dy) * zRObj.getBreite();
+                        ygr2 = (yp + dy) * zRObj.getWidth();
                         ygr = (int)y * br;
                         for (dx = xs; dx < maxX; ++dx)
                         {
@@ -937,8 +937,8 @@ void EngravedTextRenderer::renderChar(int& x,
                 }
             }
             if (underlined)
-                zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                    y + getZeilenHeight() + getZeichenAbstand() / 2,
+                zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                    y + getRowHeight() + getCharSpacing() / 2,
                     getCharWidth(c) + (int)(zeichenAbstand / 2.0 + 0.5),
                     0xFF000000 | color);
         }
@@ -949,32 +949,32 @@ void EngravedTextRenderer::renderChar(int& x,
         if (selected)
             zRObj.alphaRegion(x,
                 y,
-                schriftSize / 2 + zeichenAbstand,
-                getZeilenHeight() + zeilenAbstand,
+                fontSize / 2 + zeichenAbstand,
+                getRowHeight() + zeilenAbstand,
                 selectedBackgroundColor);
         if (underlined)
-            zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                y + getZeilenHeight() + getZeichenAbstand() / 2,
-                schriftSize / 2 + zeichenAbstand
+            zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                y + getRowHeight() + getCharSpacing() / 2,
+                fontSize / 2 + zeichenAbstand
                     + (int)(zeichenAbstand / 2.0 + 0.5),
                 0xFF000000 | color);
-        x += schriftSize / 2 + zeichenAbstand;
+        x += fontSize / 2 + zeichenAbstand;
     }
     else if (c == '\t')
     {
         if (selected)
             zRObj.alphaRegion(x,
                 y,
-                schriftSize + zeichenAbstand,
-                getZeilenHeight() + zeilenAbstand,
+                fontSize + zeichenAbstand,
+                getRowHeight() + zeilenAbstand,
                 selectedBackgroundColor);
         if (underlined)
-            zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                y + getZeilenHeight() + getZeichenAbstand() / 2,
-                schriftSize + zeichenAbstand
+            zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                y + getRowHeight() + getCharSpacing() / 2,
+                fontSize + zeichenAbstand
                     + (int)(zeichenAbstand / 2.0 + 0.5),
                 0xFF000000 | color);
-        x += schriftSize + zeichenAbstand;
+        x += fontSize + zeichenAbstand;
     }
 }
 
@@ -983,9 +983,9 @@ void EngravedTextRenderer::renderChar(int& x,
 int EngravedTextRenderer::getCharWidth(const char c) const
 {
     if (c == '\t')
-        return schriftSize;
+        return fontSize;
     else if (c == ' ')
-        return schriftSize / 2;
+        return fontSize / 2;
     else
         return TextRenderer::getCharWidth(c) * 2;
 }
@@ -1001,14 +1001,14 @@ ItalicTextRenderer::ItalicTextRenderer()
     : ItalicTextRenderer(0)
 {}
 
-ItalicTextRenderer::ItalicTextRenderer(Font* schrift)
-    : TextRenderer(schrift)
+ItalicTextRenderer::ItalicTextRenderer(Font* font)
+    : TextRenderer(font)
 {}
 
 ItalicTextRenderer::~ItalicTextRenderer() {}
 
 // Draws a specific character with coloring onto an image
-// Use (setPosition) and (setDrawSchriftGroesse) to change position and size
+// Use (setPosition) and (setDrawFontGroesse) to change position and size
 //  x: x position of the first character
 //  y: y position of the first character
 //  txt: The text to draw
@@ -1027,12 +1027,12 @@ void ItalicTextRenderer::renderChar(int& x,
     int selectedBackgroundColor)
 {
     if (!s) return;
-    Alphabet* a = s->zAlphabet((unsigned char)schriftSize);
+    Alphabet* a = s->zAlphabet((unsigned char)fontSize);
     if (!a) return;
     Character* b = a->zCharacter(c);
     if (b)
     {
-        if (x >= zRObj.getBreite()) return;
+        if (x >= zRObj.getWidth()) return;
         if (zRObj.isAreaDrawable(x, y, getCharWidth(c), getCharHeight(c)))
         {
             if (selected)
@@ -1041,25 +1041,25 @@ void ItalicTextRenderer::renderChar(int& x,
                 zRObj.alphaRegion(x,
                     y,
                     br,
-                    getZeilenHeight() + zeilenAbstand,
+                    getRowHeight() + zeilenAbstand,
                     selectedBackgroundColor);
             }
             if (b->getBuff())
             {
-                const Punkt& zRObjGr = zRObj.getDrawGr();
-                const Punkt& zRObjPos = zRObj.getDrawPos();
-                const Punkt& zRObjOff = zRObj.getDrawOff();
+                const Point& zRObjGr = zRObj.getDrawGr();
+                const Point& zRObjPos = zRObj.getDrawPos();
+                const Point& zRObjOff = zRObj.getDrawOff();
                 int xp = x + zRObjOff.x, yp = y + zRObjOff.y;
                 int xStartBuffer = xp < zRObjPos.x ? (zRObjPos.x - xp) : 0,
                     yStartBuffer = yp < zRObjPos.y ? (zRObjPos.y - yp) : 0;
-                int bufferBreite = b->getBreite(),
+                int bufferWidth = b->getWidth(),
                     bufferHeight = b->getHeight();
                 unsigned char colorAlpha = (unsigned char)(255 - (color >> 24));
                 color &= 0x00FFFFFF;
                 double xStepBuffer
-                    = (double)b->getSchriftSize() / (double)schriftSize,
+                    = (double)b->getFontSize() / (double)fontSize,
                     yStepBuffer
-                    = (double)b->getSchriftSize() / (double)schriftSize;
+                    = (double)b->getFontSize() / (double)fontSize;
                 double xBuffer = xStartBuffer * xStepBuffer,
                        yBuffer = yStartBuffer * yStepBuffer;
                 int charHeight = getCharHeight(c);
@@ -1069,22 +1069,22 @@ void ItalicTextRenderer::renderChar(int& x,
                 maxYBuffer = (yp + maxYBuffer) >= zRObjGr.y ? (zRObjGr.y - yp)
                                                             : maxYBuffer;
                 std::function<int(int x, int y)> colorF = [charHeight,
-                                                              bufferBreite,
+                                                              bufferWidth,
                                                               bufferHeight,
                                                               colorAlpha,
                                                               b,
                                                               color](
                                                               int xx, int yy) {
                     xx -= (int)((float)(charHeight - yy) / 4.f + 0.5f);
-                    if (xx < 0 || xx >= bufferBreite) return 0x00FFFFFF;
-                    int a = b->getBuff()[yy * bufferBreite + xx] - colorAlpha;
+                    if (xx < 0 || xx >= bufferWidth) return 0x00FFFFFF;
+                    int a = b->getBuff()[yy * bufferWidth + xx] - colorAlpha;
                     return color | (a << 24);
                 };
                 if (zRObj.hasAlpha3D())
                 {
                     for (int yS = yStartBuffer; yS < maxYBuffer; ++yS)
                     {
-                        int ygr2 = (yp + yS) * zRObj.getBreite();
+                        int ygr2 = (yp + yS) * zRObj.getWidth();
                         for (int xS = xStartBuffer; xS < maxXBuffer; ++xS)
                         {
                             zRObj.alphaPixel3D(
@@ -1099,7 +1099,7 @@ void ItalicTextRenderer::renderChar(int& x,
                 {
                     for (int yS = yStartBuffer; yS < maxYBuffer; ++yS)
                     {
-                        int ygr2 = (yp + yS) * zRObj.getBreite();
+                        int ygr2 = (yp + yS) * zRObj.getWidth();
                         for (int xS = xStartBuffer; xS < maxXBuffer; ++xS)
                         {
                             zRObj.alphaPixel2D(
@@ -1112,8 +1112,8 @@ void ItalicTextRenderer::renderChar(int& x,
                 }
             }
             if (underlined)
-                zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                    y + getZeilenHeight() + getZeichenAbstand() / 2,
+                zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                    y + getRowHeight() + getCharSpacing() / 2,
                     getCharWidth(c) + (int)(zeichenAbstand / 2.0 + 0.5),
                     0xFF000000 | color);
         }
@@ -1124,32 +1124,32 @@ void ItalicTextRenderer::renderChar(int& x,
         if (selected)
             zRObj.alphaRegion(x,
                 y,
-                schriftSize / 2 + zeichenAbstand,
-                getZeilenHeight() + zeilenAbstand,
+                fontSize / 2 + zeichenAbstand,
+                getRowHeight() + zeilenAbstand,
                 selectedBackgroundColor);
         if (underlined)
-            zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                y + getZeilenHeight() + getZeichenAbstand() / 2,
-                schriftSize / 2 + zeichenAbstand
+            zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                y + getRowHeight() + getCharSpacing() / 2,
+                fontSize / 2 + zeichenAbstand
                     + (int)(zeichenAbstand / 2.0 + 0.5),
                 0xFF000000 | color);
-        x += schriftSize / 2 + zeichenAbstand;
+        x += fontSize / 2 + zeichenAbstand;
     }
     else if (c == '\t')
     {
         if (selected)
             zRObj.alphaRegion(x,
                 y,
-                schriftSize + zeichenAbstand,
-                getZeilenHeight() + zeilenAbstand,
+                fontSize + zeichenAbstand,
+                getRowHeight() + zeilenAbstand,
                 selectedBackgroundColor);
         if (underlined)
-            zRObj.drawLinieHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
-                y + getZeilenHeight() + getZeichenAbstand() / 2,
-                schriftSize + zeichenAbstand
+            zRObj.drawLineHAlpha(x - (int)(zeichenAbstand / 2.0 + 0.5),
+                y + getRowHeight() + getCharSpacing() / 2,
+                fontSize + zeichenAbstand
                     + (int)(zeichenAbstand / 2.0 + 0.5),
                 0xFF000000 | color);
-        x += schriftSize + zeichenAbstand;
+        x += fontSize + zeichenAbstand;
     }
 }
 
@@ -1158,9 +1158,9 @@ void ItalicTextRenderer::renderChar(int& x,
 int ItalicTextRenderer::getCharWidth(const char c) const
 {
     if (c == '\t')
-        return schriftSize;
+        return fontSize;
     else if (c == ' ')
-        return schriftSize / 2;
+        return fontSize / 2;
     else
         return (
             int)(TextRenderer::getCharWidth(c) + getCharHeight(c) / 4.0 + 0.5);

Font.h

@@ -1,5 +1,5 @@
-#ifndef Schrift_H
-#define Schrift_H
+#ifndef Font_H
+#define Font_H
 
 #include <functional>
 
@@ -21,9 +21,9 @@ namespace Framework
     class Character : public virtual ReferenceCounter
     {
     private:
-        Punkt size;
+        Point size;
         unsigned char* alpha;
-        int schriftSize;
+        int fontSize;
 
     public:
         //! Creates a new empty object
@@ -32,11 +32,11 @@ namespace Framework
         DLLEXPORT ~Character();
         //! Creates a new character with a specific size
         //! \param size The size of the character in pixels
-        DLLEXPORT void NewCharacter(Punkt& size);
+        DLLEXPORT void NewCharacter(Point& size);
         //! Sets the alpha value of a specific pixel
         //! \param pos The position of the pixel
         //! \param alpha The value of the pixel
-        DLLEXPORT void setPixel(Punkt& pos, unsigned char alpha);
+        DLLEXPORT void setPixel(Point& pos, unsigned char alpha);
         //! Sets the alpha value of a specific pixel
         //! \param x The x position of the pixel
         //! \param y The y position of the pixel
@@ -49,16 +49,16 @@ namespace Framework
         DLLEXPORT void setPixel(int i, unsigned char alpha);
         //! Sets the font size this character belongs to
         //! \param sg The font size of the character.
-        DLLEXPORT void setSchriftSize(int sg);
+        DLLEXPORT void setFontSize(int sg);
         //! Returns the font size this character belongs to
-        DLLEXPORT int getSchriftSize() const;
+        DLLEXPORT int getFontSize() const;
         //! Returns the alpha values of the character as an array where the
         //! values are stored row by row
         DLLEXPORT unsigned char* getBuff() const;
         //! Returns the unscaled size of the character in pixels.
-        DLLEXPORT const Punkt& getSize() const;
+        DLLEXPORT const Point& getSize() const;
         //! Returns the width of the character in pixels
-        DLLEXPORT int getBreite() const;
+        DLLEXPORT int getWidth() const;
         //! Returns the height of the character in pixels
         DLLEXPORT int getHeight() const;
     };
@@ -69,7 +69,7 @@ namespace Framework
     {
     private:
         Character** zeichen;
-        int schriftSize;
+        int fontSize;
 
     public:
         //! Creates an empty object
@@ -85,7 +85,7 @@ namespace Framework
         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);
+        DLLEXPORT void setFontSize(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
@@ -98,9 +98,9 @@ namespace Framework
         //! \param b The ASCII code to check
         //! \return (true) if a character was found for the code. (false)
         //! otherwise
-        DLLEXPORT bool hatBuchstabe(unsigned char b) const;
+        DLLEXPORT bool hasCharacter(unsigned char b) const;
         //! Returns the font size whose characters are stored in this alphabet
-        DLLEXPORT int getSchriftSize() const;
+        DLLEXPORT int getFontSize() const;
     };
 
     //! Stores a list of alphabets with different font sizes.
@@ -138,7 +138,7 @@ namespace Framework
     class Font : public virtual ReferenceCounter
     {
     private:
-        unsigned char alphabetAnzahl;
+        unsigned char alphabetCount;
         AlphabetArray* alphabet;
 
     public:
@@ -163,14 +163,14 @@ namespace Framework
         //! \return (0) if no matching alphabet was found
         DLLEXPORT Alphabet* zAlphabet(unsigned char sg) const;
         //! Returns how many alphabets (and thus font sizes) the font contains
-        DLLEXPORT unsigned char getAlphabetAnzahl() const;
+        DLLEXPORT unsigned char getAlphabetCount() const;
     };
 
     class TextRenderer : public virtual ReferenceCounter
     {
     protected:
         Font* s;
-        int schriftSize;
+        int fontSize;
         int zeilenAbstand;
         int zeichenAbstand;
         int charWidths[256];
@@ -178,27 +178,27 @@ namespace Framework
 
     public:
         DLLEXPORT TextRenderer();
-        DLLEXPORT TextRenderer(Font* schrift);
+        DLLEXPORT TextRenderer(Font* font);
         DLLEXPORT virtual ~TextRenderer();
-        DLLEXPORT void setFontZ(Font* schrift);
+        DLLEXPORT void setFontZ(Font* font);
         DLLEXPORT Font* getFont();
         DLLEXPORT Font* zFont();
         //! Sets the font size to draw with. The font automatically
         //! selects the appropriate alphabet for drawing \param sg The font size
-        DLLEXPORT void setSchriftSize(int sg);
+        DLLEXPORT void setFontSize(int sg);
         //! Sets the line spacing to use for drawing
         //! \param za The line spacing to the bottom of the line above in pixels
-        DLLEXPORT void setZeilenAbstand(int za);
+        DLLEXPORT void setLineSpacing(int za);
         //! Sets the character spacing to use for drawing
         //! \param za The character spacing in pixels
-        DLLEXPORT void setZeichenAbstand(int za);
+        DLLEXPORT void setCharSpacing(int za);
         //! Inserts line breaks into the text so it is fully displayed
         //! at a given width \param zText The text to insert line breaks into
-        //! \param maxBreite The width in pixels at which the text should be
+        //! \param maxWidth The width in pixels at which the text should be
         //! fully displayed
-        DLLEXPORT virtual void textFormatieren(Text* zText, int maxBreite);
+        DLLEXPORT virtual void formatText(Text* zText, int maxWidth);
         //! Draws a specific text with cursor and coloring onto an image.
-        //! Use (setPosition) and (setDrawSchriftGroesse) to change position
+        //! Use (setPosition) and (setDrawFontGroesse) to change position
         //! and size \param x x position of the first character
         //! \param y y position of the first character
         //! \param txt The text to draw
@@ -219,7 +219,7 @@ namespace Framework
             int fbeg = -1,
             int ff = 0);
         //! Draws a specific text with cursor and coloring onto an image.
-        //! Use (setPosition) and (setDrawSchriftGroesse) to change position
+        //! Use (setPosition) and (setDrawFontGroesse) to change position
         //! and size \param x x position of the first character
         //! \param y y position of the first character
         //! \param txt The text to draw
@@ -240,7 +240,7 @@ namespace Framework
             int fbeg = -1,
             int ff = 0);
         //! Draws a specific character with coloring onto an image.
-        //! Use (setPosition) and (setDrawSchriftGroesse) to change position
+        //! Use (setPosition) and (setDrawFontGroesse) to change position
         //! and size \param x x position of the first character
         //! \param y y position of the first character
         //! \param txt The text to draw
@@ -259,10 +259,10 @@ namespace Framework
             bool selected = 0,
             int selectedBackgroundColor = 0);
         //! Returns the font size used for drawing
-        DLLEXPORT int getSchriftSize() const;
+        DLLEXPORT int getFontSize() const;
         //! Determines how many pixels are needed to fully display a specific text
         //! \param txt The text whose width in pixels should be determined
-        DLLEXPORT virtual int getTextBreite(const char* txt) const;
+        DLLEXPORT virtual int getTextWidth(const char* txt) const;
         //! Determines how many pixels are needed to fully display a specific text
         //! \param txt The text whose height in pixels should be determined
         DLLEXPORT virtual int getTextHeight(const char* txt) const;
@@ -277,28 +277,28 @@ namespace Framework
         //! determined
         DLLEXPORT virtual int getCharHeight(const char c) const;
         //! Returns the line spacing in pixels to the bottom of the line above
-        DLLEXPORT int getZeilenAbstand() const;
+        DLLEXPORT int getLineSpacing() const;
         //! Returns the character spacing in pixels on the x axis
-        DLLEXPORT int getZeichenAbstand() const;
+        DLLEXPORT int getCharSpacing() const;
         //! Returns the scaled height needed by a drawn line in pixels
-        DLLEXPORT int getZeilenHeight() const;
+        DLLEXPORT int getRowHeight() const;
         //! Determines the character in the text that the mouse points to
         //! \param zTxt The text the mouse points to
-        //! \param mausX The X position of the mouse in pixels relative to the
-        //! position of the first character \param mausY The Y position of the
+        //! \param mouseX The X position of the mouse in pixels relative to the
+        //! position of the first character \param mouseY The Y position of the
         //! mouse in pixels relative to the position of the first character
         DLLEXPORT virtual int textPos(
-            const char* txt, int mausX, int mausY) const;
+            const char* txt, int mouseX, int mouseY) const;
     };
 
     class EngravedTextRenderer : public TextRenderer
     {
     public:
         DLLEXPORT EngravedTextRenderer();
-        DLLEXPORT EngravedTextRenderer(Font* schrift);
+        DLLEXPORT EngravedTextRenderer(Font* font);
         DLLEXPORT virtual ~EngravedTextRenderer();
         //! Draws a specific character with coloring onto an image.
-        //! Use (setPosition) and (setDrawSchriftGroesse) to change position
+        //! Use (setPosition) and (setDrawFontGroesse) to change position
         //! and size \param x x position of the first character
         //! \param y y position of the first character
         //! \param txt The text to draw
@@ -330,10 +330,10 @@ namespace Framework
     {
     public:
         DLLEXPORT ItalicTextRenderer();
-        DLLEXPORT ItalicTextRenderer(Font* schrift);
+        DLLEXPORT ItalicTextRenderer(Font* font);
         DLLEXPORT virtual ~ItalicTextRenderer();
         //! Draws a specific character with coloring onto an image.
-        //! Use (setPosition) and (setDrawSchriftGroesse) to change position
+        //! Use (setPosition) and (setDrawFontGroesse) to change position
         //! and size \param x x position of the first character
         //! \param y y position of the first character
         //! \param txt The text to draw

Framework Tests/Array.cpp

@@ -25,7 +25,7 @@ namespace FrameworkTests
             Assert::IsFalse(array.begin() != end,
                 L"Iterator of an empty array should not have an element");
             Assert::IsFalse(
-                array.hat(0), L"Empty Array should not have an element");
+                array.has(0), L"Empty Array should not have an element");
         }
 
         TEST_METHOD (AddTest)
@@ -96,8 +96,8 @@ namespace FrameworkTests
             array.add(20, 1);
             array.add(10, 0);
             array.add(0);
-            array.tausch(0, 3);
-            array.tausch(1, 2);
+            array.swap(0, 3);
+            array.swap(1, 2);
             Assert::IsTrue(array.getEntryCount() == 4,
                 L"after adding 4 elements and swap elements getEntryCount() "
                 L"should be 4");
@@ -109,7 +109,7 @@ namespace FrameworkTests
                 L"invalid value at index 2 of array after swapping elements");
             Assert::IsTrue(array.get(3) == 10,
                 L"invalid value at index 3 of array after swapping elements");
-            array.tausch(2, 0);
+            array.swap(2, 0);
             Assert::IsTrue(array.get(2) == 0,
                 L"invalid value at index 2 of array after swapping elements");
             Assert::IsTrue(array.get(0) == 100,
@@ -150,9 +150,9 @@ namespace FrameworkTests
             Assert::IsTrue(array.getEntryCount() == 3,
                 L"after adding 4 elements and removing elements by value "
                 L"getEntryCount() should be 3");
-            Assert::IsTrue(array.getWertIndex(0) == 2,
+            Assert::IsTrue(array.getValueIndex(0) == 2,
                 L"invalid value index of value after removing elements");
-            Assert::IsTrue(array.getWertIndex(10) < 0,
+            Assert::IsTrue(array.getValueIndex(10) < 0,
                 L"value is still in array after removeValue");
         }
     };
@@ -208,7 +208,7 @@ namespace FrameworkTests
             Assert::IsFalse(array.begin() != end,
                 L"Iterator of an empty array should not have an element");
             Assert::IsFalse(
-                array.hat(0), L"Empty Array should not have an element");
+                array.has(0), L"Empty Array should not have an element");
         }
 
         TEST_METHOD (AddTest)
@@ -246,7 +246,7 @@ namespace FrameworkTests
             auto end = array.end();
             Assert::IsFalse(++i != end,
                 L"iterator should match end() after iterating throu the array");
-            array.leeren();
+            array.clear();
             Assert::IsTrue(deleteCounter == 4, L"Memory leaks detected");
         }
 
@@ -273,7 +273,7 @@ namespace FrameworkTests
             Assert::IsFalse(array.begin().next() != end,
                 L"Iterator has to many elements after removing elements");
             Assert::IsTrue(deleteCounter == 3, L"Memory leaks detected");
-            array.leeren();
+            array.clear();
             Assert::IsTrue(deleteCounter == 4, L"Memory leaks detected");
         }
 
@@ -284,8 +284,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));
-            array.tausch(0, 3);
-            array.tausch(1, 2);
+            array.swap(0, 3);
+            array.swap(1, 2);
             Assert::IsTrue(array.getEntryCount() == 4,
                 L"after adding 4 elements and swap elements getEntryCount() "
                 L"should be 4");
@@ -297,14 +297,14 @@ namespace FrameworkTests
                 L"invalid value at index 2 of array after swapping elements");
             Assert::IsTrue((int)*array.z(3) == 10,
                 L"invalid value at index 3 of array after swapping elements");
-            array.tausch(2, 0);
+            array.swap(2, 0);
             Assert::IsTrue((int)*array.z(2) == 0,
                 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.getEntryCount() == 4,
                 L"invalid value count in array after swapping elements");
-            array.leeren();
+            array.clear();
             Assert::IsTrue(deleteCounter == 4, L"Memory leaks detected");
         }
 
@@ -330,7 +330,7 @@ namespace FrameworkTests
             Assert::IsTrue((int)*array.z(3) == 200,
                 L"invalid value at index 3 of array after swapping elements");
             Assert::IsTrue(deleteCounter == 3, L"Memory leaks detected");
-            array.leeren();
+            array.clear();
             Assert::IsTrue(deleteCounter == 7, L"Memory leaks detected");
         }
 

Framework Tests/Base64.cpp

@@ -85,7 +85,7 @@ namespace FrameworkTests
             Framework::base64Decode(data, &decodedData, &decodecLength);
             Framework::Text encoded
                 = Framework::base64Encode(decodedData, decodecLength);
-            Assert::IsTrue(encoded.istGleich(data));
+            Assert::IsTrue(encoded.isEqual(data));
             delete[] decodedData;
         }
     };

Framework Tests/Json.cpp

@@ -69,7 +69,7 @@ namespace FrameworkTests
                 L"a string");
             Assert::IsTrue(((Framework::JSON::JSONString*)value)
                                ->getString()
-                               .istGleich("test"),
+                               .isEqual("test"),
                 L"Framework::JSON::Parser::getValue('\"test\"') should return "
                 L"a string with value 'test'");
             value->release();
@@ -83,7 +83,7 @@ namespace FrameworkTests
                 L"string");
             Assert::IsTrue(((Framework::JSON::JSONString*)value)
                                ->getString()
-                               .istGleich(""),
+                               .isEqual(""),
                 L"Framework::JSON::Parser::getValue('\"\"') should return a "
                 L"string with value ''");
             value->release();
@@ -277,7 +277,7 @@ namespace FrameworkTests
             case Framework::AbstractType::STRING:
                 return ((Framework::JSON::JSONString*)a)
                     ->getString()
-                    .istGleich(((Framework::JSON::JSONString*)b)->getString());
+                    .isEqual(((Framework::JSON::JSONString*)b)->getString());
             case Framework::AbstractType::ARRAY:
                 {
                     Framework::JSON::JSONArray* arrayA
@@ -369,9 +369,9 @@ namespace FrameworkTests
                     });
             Assert::IsTrue(numberArray->getEntryCount() == 5,
                 L"Array hat die falsche Anzahl an elementen");
-            Assert::IsTrue(numberArray->z(1)->istGleich("2"),
+            Assert::IsTrue(numberArray->z(1)->isEqual("2"),
                 L"Array hat mindestens ein falsches element");
-            Assert::IsTrue(numberArray->z(4)->istGleich("5"),
+            Assert::IsTrue(numberArray->z(4)->isEqual("5"),
                 L"Array hat mindestens ein falsches element");
             numberArray->release();
             numberArray = jArray->toRCArray<Framework::Text>(
@@ -381,9 +381,9 @@ namespace FrameworkTests
                 [](Framework::JSON::JSONValue& v) {
                     return new Framework::Text(v.asString()->getString());
                 });
-            Assert::IsTrue(numberArray->z(0)->istGleich("2"),
+            Assert::IsTrue(numberArray->z(0)->isEqual("2"),
                 L"Array hat mindestens ein falsches element");
-            Assert::IsTrue(numberArray->z(1)->istGleich("4"),
+            Assert::IsTrue(numberArray->z(1)->isEqual("4"),
                 L"Array hat mindestens ein falsches element");
             jArray->release();
         }
@@ -405,7 +405,7 @@ namespace FrameworkTests
                 [](TestObject* obj,
                     Framework::Text attrName,
                     Framework::JSON::JSONValue& v) {
-                    if (attrName.istGleich("name"))
+                    if (attrName.isEqual("name"))
                     {
                         obj->name = v.asString()->getString();
                     }
@@ -415,9 +415,9 @@ namespace FrameworkTests
                     }
                 });
             Assert::IsTrue(
-                obj->name.istGleich("test"), L"Field hat falschen wert");
+                obj->name.isEqual("test"), L"Field hat falschen wert");
             Assert::IsTrue(
-                obj->value.istGleich("1234"), L"Field hat falschen wert");
+                obj->value.isEqual("1234"), L"Field hat falschen wert");
             delete obj;
             jObj->release();
         }
@@ -454,7 +454,7 @@ namespace FrameworkTests
             Assert::IsTrue(
                 jArray->getLength() == 4, L"Array hat falsche l�nge");
             Framework::JSON::JSONString* s = jArray->getValue(2)->asString();
-            Assert::IsTrue(s->getString().istGleich("3"),
+            Assert::IsTrue(s->getString().isEqual("3"),
                 L"Array hat mindestens einen falschen Wert");
             s->release();
             jArray->release();

Framework Tests/Trie.cpp

@@ -28,7 +28,7 @@ namespace FrameworkTests
             Text *t = trie.get("test", 4);
             Assert::AreEqual(
                 t->getReferenceCount(), 2, L"RCTrie get did not increase reference count");
-            Assert::IsTrue(t->istGleich("test"), L"RCTrie get returned invalid value");
+            Assert::IsTrue(t->isEqual("test"), L"RCTrie get returned invalid value");
         }
     };
 } // namespace FrameworkTests

Framework Tests/XML.cpp

@@ -17,7 +17,7 @@ namespace FrameworkTests
                 "<xml attr attr2=\"\" attr3=\"true\"/>");
             Assert::IsTrue(element->getAttributeCount() == 3,
                 L"One ore more xml attributes are missing");
-            Assert::IsTrue(element->getName().istGleich("xml"),
+            Assert::IsTrue(element->getName().isEqual("xml"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->getChildCount() == 0,
                 L"Das Element sollte keine Kinder haben");
@@ -29,18 +29,18 @@ namespace FrameworkTests
                 element->hasAttribute("attr3"), L"Das Attribut attr3 fehlt");
             Assert::IsTrue(element->hasAttribute("") == 0,
                 L"Es gibt ein falsches Attribut");
-            Assert::IsTrue(element->getAttributeName(0).istGleich("attr"),
+            Assert::IsTrue(element->getAttributeName(0).isEqual("attr"),
                 L"Der Attribut name ist falsch");
-            Assert::IsTrue(element->getAttributeName(1).istGleich("attr2"),
+            Assert::IsTrue(element->getAttributeName(1).isEqual("attr2"),
                 L"Der Attribut name ist falsch");
-            Assert::IsTrue(element->getAttributeName(2).istGleich("attr3"),
+            Assert::IsTrue(element->getAttributeName(2).isEqual("attr3"),
                 L"Der Attribut name ist falsch");
-            Assert::IsTrue(element->getAttributeValue("attr").istGleich(""),
+            Assert::IsTrue(element->getAttributeValue("attr").isEqual(""),
                 L"Der Wert des Attributes ist falsch");
-            Assert::IsTrue(element->getAttributeValue("attr2").istGleich(""),
+            Assert::IsTrue(element->getAttributeValue("attr2").isEqual(""),
                 L"Der Wert des Attributes ist falsch");
             Assert::IsTrue(
-                element->getAttributeValue("attr3").istGleich("true"),
+                element->getAttributeValue("attr3").isEqual("true"),
                 L"Der Wert des Attributes ist falsch");
             element->release();
         }
@@ -51,7 +51,7 @@ namespace FrameworkTests
                 = new Framework::XML::Element("<xml><a1/><a2/></xml>");
             Assert::IsTrue(element->getAttributeCount() == 0,
                 L"Die Anzahl der Attribute stimmt nicht");
-            Assert::IsTrue(element->getName().istGleich("xml"),
+            Assert::IsTrue(element->getName().isEqual("xml"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->getChildCount() == 2,
                 L"Die Anzahl der Kinder ist falsch");
@@ -59,9 +59,9 @@ namespace FrameworkTests
                 L"Die Anzahl der Attribute stimmt nicht");
             Assert::IsTrue(element->zChild(1)->getAttributeCount() == 0,
                 L"Die Anzahl der Attribute stimmt nicht");
-            Assert::IsTrue(element->zChild(0)->getName().istGleich("a1"),
+            Assert::IsTrue(element->zChild(0)->getName().isEqual("a1"),
                 L"Der Element Name ist falsch");
-            Assert::IsTrue(element->zChild(1)->getName().istGleich("a2"),
+            Assert::IsTrue(element->zChild(1)->getName().isEqual("a2"),
                 L"Der Element Name ist falsch");
             element->release();
         }
@@ -72,7 +72,7 @@ namespace FrameworkTests
                 "<xml \t \r\n \t > \r\n <a1 x y z=\"\"/> <a2/>\t</xml     >");
             Assert::IsTrue(element->getAttributeCount() == 0,
                 L"Die Anzahl der Attribute stimmt nicht");
-            Assert::IsTrue(element->getName().istGleich("xml"),
+            Assert::IsTrue(element->getName().isEqual("xml"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->getChildCount() == 2,
                 L"Die Anzahl der Kinder ist falsch");
@@ -80,9 +80,9 @@ namespace FrameworkTests
                 L"Die Anzahl der Attribute stimmt nicht");
             Assert::IsTrue(element->zChild(1)->getAttributeCount() == 0,
                 L"Die Anzahl der Attribute stimmt nicht");
-            Assert::IsTrue(element->zChild(0)->getName().istGleich("a1"),
+            Assert::IsTrue(element->zChild(0)->getName().isEqual("a1"),
                 L"Der Element Name ist falsch");
-            Assert::IsTrue(element->zChild(1)->getName().istGleich("a2"),
+            Assert::IsTrue(element->zChild(1)->getName().isEqual("a2"),
                 L"Der Element Name ist falsch");
             element->release();
         }
@@ -96,7 +96,7 @@ namespace FrameworkTests
             Framework::XML::Element* element = new Framework::XML::Element(
                 "<xml><a1 x y z=\"\"/><a2/></xml>");
             element->selectChildren().setAttribute("x", "true");
-            Assert::IsTrue(element->getName().istGleich("xml"),
+            Assert::IsTrue(element->getName().isEqual("xml"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->getChildCount() == 2,
                 L"Die Anzahl der Kinder ist falsch");
@@ -104,15 +104,15 @@ namespace FrameworkTests
                 L"Die Anzahl der Attribute stimmt nicht");
             Assert::IsTrue(element->zChild(1)->getAttributeCount() == 1,
                 L"Die Anzahl der Attribute stimmt nicht");
-            Assert::IsTrue(element->zChild(0)->getName().istGleich("a1"),
+            Assert::IsTrue(element->zChild(0)->getName().isEqual("a1"),
                 L"Der Element Name ist falsch");
-            Assert::IsTrue(element->zChild(1)->getName().istGleich("a2"),
+            Assert::IsTrue(element->zChild(1)->getName().isEqual("a2"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(
-                element->zChild(0)->getAttributeValue("x").istGleich("true"),
+                element->zChild(0)->getAttributeValue("x").isEqual("true"),
                 L"Der Attribut wert ist falsch");
             Assert::IsTrue(
-                element->zChild(1)->getAttributeValue("x").istGleich("true"),
+                element->zChild(1)->getAttributeValue("x").isEqual("true"),
                 L"Der Attribut wert ist falsch");
             element->release();
         }
@@ -122,7 +122,7 @@ namespace FrameworkTests
             Framework::XML::Element* element = new Framework::XML::Element(
                 "<xml><a1 x y z=\"\"/><a2/></xml>");
             element->selectChildren().removeAttribute("x");
-            Assert::IsTrue(element->getName().istGleich("xml"),
+            Assert::IsTrue(element->getName().isEqual("xml"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->getChildCount() == 2,
                 L"Die Anzahl der Kinder ist falsch");
@@ -130,9 +130,9 @@ namespace FrameworkTests
                 L"Die Anzahl der Attribute stimmt nicht");
             Assert::IsTrue(element->zChild(1)->getAttributeCount() == 0,
                 L"Die Anzahl der Attribute stimmt nicht");
-            Assert::IsTrue(element->zChild(0)->getName().istGleich("a1"),
+            Assert::IsTrue(element->zChild(0)->getName().isEqual("a1"),
                 L"Der Element Name ist falsch");
-            Assert::IsTrue(element->zChild(1)->getName().istGleich("a2"),
+            Assert::IsTrue(element->zChild(1)->getName().isEqual("a2"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->zChild(0)->hasAttribute("x") == 0,
                 L"Ein entferntes Attibut ist noch vorhanden");
@@ -147,7 +147,7 @@ namespace FrameworkTests
                 "<xml><a1 x y z=\"\"/><a2/></xml>");
             element->selectChildren().whereAttributeExists("x").addChild(
                 element->dublicate());
-            Assert::IsTrue(element->getName().istGleich("xml"),
+            Assert::IsTrue(element->getName().isEqual("xml"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->getChildCount() == 2,
                 L"Die Anzahl der Kinder ist falsch");
@@ -155,9 +155,9 @@ namespace FrameworkTests
                 L"Die Anzahl der Attribute stimmt nicht");
             Assert::IsTrue(element->zChild(1)->getAttributeCount() == 0,
                 L"Die Anzahl der Attribute stimmt nicht");
-            Assert::IsTrue(element->zChild(0)->getName().istGleich("a1"),
+            Assert::IsTrue(element->zChild(0)->getName().isEqual("a1"),
                 L"Der Element Name ist falsch");
-            Assert::IsTrue(element->zChild(1)->getName().istGleich("a2"),
+            Assert::IsTrue(element->zChild(1)->getName().isEqual("a2"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->zChild(0)->getChildCount() == 1,
                 L"Anzahl der Kinder ist Falsch");
@@ -171,7 +171,7 @@ namespace FrameworkTests
             Framework::XML::Element* element = new Framework::XML::Element(
                 "<xml><a1 x y z=\"\"/><a2/></xml>");
             element->selectChildren().whereAttributeExists("x").remove();
-            Assert::IsTrue(element->getName().istGleich("xml"),
+            Assert::IsTrue(element->getName().isEqual("xml"),
                 L"Der Element Name ist falsch");
             Assert::IsTrue(element->getChildCount() == 1,
                 L"Die Anzahl der Kinder ist falsch");

Global.cpp

@@ -23,7 +23,7 @@
 
 void Framework::initFramework(HINSTANCE__* hInst)
 {
-    if (istInitialisiert) return;
+    if (isInitialized) return;
     loggingHandler = new Logging::LoggingHandler();
     thRegister = new ThreadRegister();
 #ifdef WIN32
@@ -31,30 +31,30 @@ void Framework::initFramework(HINSTANCE__* hInst)
     ULONG_PTR gdiplusToken;
     Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, 0);
     msgExit = 0;
-    MausTrack = 1;
+    MouseTrack = 1;
 #endif
     for (int i = 0; i < 3; ++i)
-        MausStand[i] = 0;
+        MouseState[i] = 0;
     TextureList::init();
     dlls = new DLLRegister();
     _hinst = hInst;
-    istInitialisiert = 1;
+    isInitialized = 1;
     debugDX = 0;
     cursorVisible = 1;
 }
 
 void Framework::releaseFramework()
 {
-    if (!istInitialisiert) return;
+    if (!isInitialized) return;
     thRegister->cleanUpClosedThreads();
     dlls->release();
     TextureList::destroy();
     delete thRegister;
     loggingHandler->release();
-    istInitialisiert = 0;
+    isInitialized = 0;
 }
 
-bool Framework::istThreadOk(Thread* t)
+bool Framework::isThreadOk(Thread* t)
 {
     return thRegister->isThread(t);
 }
@@ -67,7 +67,7 @@ Framework::ThreadRegister* Framework::getThreadRegister()
 
 #ifdef WIN32
 
-Framework::Punkt Framework::getMausPos()
+Framework::Point Framework::getMousePos()
 {
     POINT point;
     GetCursorPos(&point);
@@ -75,22 +75,22 @@ Framework::Punkt Framework::getMausPos()
 }
 
 //! Sets the mouse position on the screen
-void Framework::setMausPos(const Punkt& pos)
+void Framework::setMousePos(const Point& pos)
 {
     SetCursorPos(pos.x, pos.y);
 }
 
 #endif
 
-bool Framework::getMausStand(int taste)
+bool Framework::getMouseState(int key)
 {
-    return MausStand[taste];
+    return MouseState[key];
 }
 
-bool Framework::getTastenStand(unsigned char taste)
+bool Framework::getKeyState(unsigned char key)
 {
 #ifdef WIN32
-    return GetKeyState(taste) & 0x8000;
+    return GetKeyState(key) & 0x8000;
 #else
     return 0;
 #endif

Globals.h

@@ -33,12 +33,12 @@ namespace Framework
     class NativeWindowArray; //! Window.h
 
     Global NativeWindowArray nativeWindows;
-    Global bool MausTrack;
+    Global bool MouseTrack;
     Global Mouse mousePointer;
     Global bool msgExit;
 #endif
-    Global bool MausStand[3];
-    Global bool istInitialisiert;
+    Global bool MouseState[3];
+    Global bool isInitialized;
     Global ThreadRegister* thRegister;
     Global Critical logC;
     Global HINSTANCE__* _hinst;
@@ -49,19 +49,19 @@ namespace Framework
 
 #ifdef WIN32
     //! Returns the mouse coordinates on the screen
-    DLLEXPORT Punkt getMausPos();
+    DLLEXPORT Point getMousePos();
     //! Sets the position of the mouse on the screen
-    DLLEXPORT void setMausPos(const Punkt& pos);
+    DLLEXPORT void setMousePos(const Point& pos);
 #endif
     //! Returns whether a mouse button is currently pressed
-    //! \param taste The button to check
-    //! Example: getMausStand( M_Links ); (Requires include <MouseEvent.h>)
-    DLLEXPORT bool getMausStand(int taste);
+    //! \param key The button to check
+    //! Example: getMouseState( M_Left ); (Requires include <MouseEvent.h>)
+    DLLEXPORT bool getMouseState(int key);
     //! Returns whether a keyboard key is currently pressed
-    //! \param taste The key to check
-    //! Example: getTastenStand( T_Enter ); (Requires include
+    //! \param key The key to check
+    //! Example: getKeyState( T_Enter ); (Requires include
     //! <KeyboardEvent.h>)
-    DLLEXPORT bool getTastenStand(unsigned char taste);
+    DLLEXPORT bool getKeyState(unsigned char key);
     //! Initializes the framework.
     //! Called automatically in the framework's (WinMain)
     DLLEXPORT void initFramework(HINSTANCE__* hInst = 0);
@@ -72,7 +72,7 @@ namespace Framework
     //! \param t The pointer to check
     //! \return 1 if the pointer is valid. 0 if the pointer does not
     //! point to an existing Thread object
-    DLLEXPORT bool istThreadOk(Thread* t);
+    DLLEXPORT bool isThreadOk(Thread* t);
     //! Returns the framework's thread register
     DLLEXPORT ThreadRegister* getThreadRegister();
     //! Returns the DLL register containing all currently dynamically loaded

GraphicsApi.cpp

@@ -33,7 +33,7 @@ void GraphicsApi::initialize(
     if (this->fenster) this->fenster->release();
     this->fenster = fenster;
     if (!backBufferSize.x || !backBufferSize.y)
-        backBufferSize = fenster ? fenster->getKoerperGroesse() : Punkt(0, 0);
+        backBufferSize = fenster ? fenster->getBodySize() : Point(0, 0);
 #endif
     this->backBufferSize = backBufferSize;
     this->fullScreen = fullScreen;
@@ -100,7 +100,7 @@ Model3DData* GraphicsApi::getModel(const char* name)
 Model3DData* GraphicsApi::createModel(const char* name)
 {
     cs.lock();
-    if (modelList->hatModel(name))
+    if (modelList->hasModel(name))
     {
         cs.unlock();
         return 0;
@@ -116,7 +116,7 @@ Model3DData* GraphicsApi::createModel(const char* name)
 bool GraphicsApi::hasModel(const char* name)
 {
     cs.lock();
-    bool res = modelList->hatModel(name);
+    bool res = modelList->hasModel(name);
     cs.unlock();
     return res;
 }

HashMap.h

@@ -313,11 +313,11 @@ namespace Framework
             return size;
         }
 
-        void leeren()
+        void clear()
         {
             for (int i = 0; i < bucketCount; i++)
             {
-                if (buckets[i]) buckets[i]->leeren();
+                if (buckets[i]) buckets[i]->clear();
             }
         }
 

Image.cpp

@@ -40,12 +40,12 @@ Image::Image(bool options)
       fc(0),
       delFc(1),
       size(0, 0),
-      drawOff(options ? new Punkt[2000] : new Punkt[1]),
-      dPosA(options ? new Punkt[2000] : new Punkt[1]),
-      dSizeA(options ? new Punkt[2000] : new Punkt[1]),
+      drawOff(options ? new Point[2000] : new Point[1]),
+      dPosA(options ? new Point[2000] : new Point[1]),
+      dSizeA(options ? new Point[2000] : new Point[1]),
       doa(0),
       alpha(options ? new unsigned char[1000] : new unsigned char[1]),
-      alphaAnzahl(0),
+      alphaCount(0),
       rend(0),
       alpha3D(0)
 {
@@ -122,7 +122,7 @@ inline void Image::alphaPixelP(int& fc, int colorb)
        | ((fc & 0xFF000000));
 }
 
-char Image::getOutCode(Punkt p) const
+char Image::getOutCode(Point p) const
 {
     char ret = 0;
     if (p.x < dPosA[doa].x) ret = 1;
@@ -132,8 +132,8 @@ char Image::getOutCode(Punkt p) const
     return ret;
 }
 
-void Image::drawFlatDreieck(
-    int y1, int y2, float m1, float b1, float m2, float b2, int farbe)
+void Image::drawFlatTriangle(
+    int y1, int y2, float m1, float b1, float m2, float b2, int color)
 {
     const int yStart = max(y1, dPosA[doa].y);
     const int yEnd = min(y2, dSizeA[doa].y);
@@ -142,11 +142,11 @@ void Image::drawFlatDreieck(
         const int xStart = max((int)(m1 * (float)y + b1 + 0.5f), dPosA[doa].x);
         const int xEnd = min((int)(m2 * (float)y + b2 + 0.5f), dSizeA[doa].x);
         for (int x = xStart; x < xEnd; x++)
-            fc[x + y * size.x] = farbe;
+            fc[x + y * size.x] = color;
     }
 }
 
-void Image::drawFlatDreieckTextur(int y1,
+void Image::drawFlatTriangleTexture(int y1,
     int y2,
     double m1,
     double b1,
@@ -175,7 +175,7 @@ void Image::drawFlatDreieckTextur(int y1,
     {
         const double xStart = m1 * y + b1;
         const double xEnd = m2 * y + b2;
-        drawLinieHTextur(Vec2<double>(xStart, y),
+        drawLineHTexture(Vec2<double>(xStart, y),
             xEnd - xStart,
             Vec2<double>(tx_1, ty_1),
             Vec2<double>(tx_2, ty_2),
@@ -185,8 +185,8 @@ void Image::drawFlatDreieckTextur(int y1,
     }
 }
 
-void Image::drawFlatDreieckAlpha(
-    int y1, int y2, float m1, float b1, float m2, float b2, int farbe)
+void Image::drawFlatTriangleAlpha(
+    int y1, int y2, float m1, float b1, float m2, float b2, int color)
 {
     const int yStart = max((int)(y1 + 0.5), dPosA[doa].y);
     const int yEnd = min((int)(y2 + 0.5), dSizeA[doa].y);
@@ -199,7 +199,7 @@ void Image::drawFlatDreieckAlpha(
             const int xEnd
                 = min((int)(m2 * ((float)y + 0.5) + b2 + 0.5f), dSizeA[doa].x);
             for (int x = xStart; x < xEnd; x++)
-                alphaPixelP3D(fc[x + y * size.x], farbe);
+                alphaPixelP3D(fc[x + y * size.x], color);
         }
     }
     else
@@ -211,12 +211,12 @@ void Image::drawFlatDreieckAlpha(
             const int xEnd
                 = min((int)(m2 * ((float)y + 0.5) + b2 + 0.5f), dSizeA[doa].x);
             for (int x = xStart; x < xEnd; x++)
-                alphaPixelP(fc[x + y * size.x], farbe);
+                alphaPixelP(fc[x + y * size.x], color);
         }
     }
 }
 
-void Image::drawFlatDreieckTexturAlpha(int y1,
+void Image::drawFlatTriangleTextureAlpha(int y1,
     int y2,
     double m1,
     double b1,
@@ -255,7 +255,7 @@ void Image::drawFlatDreieckTexturAlpha(int y1,
     }
 }
 
-void Image::drawLinieHTextur(Vec2<double> p,
+void Image::drawLineHTexture(Vec2<double> p,
     double len,
     Vec2<double> ta,
     Vec2<double> tb,
@@ -263,8 +263,8 @@ void Image::drawLinieHTextur(Vec2<double> p,
     double tyo,
     const Image& textur) // draws a horizontal line
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
         drawLineHTextureAlpha(p, len, ta, tb, txo, tyo, textur);
         return;
@@ -297,7 +297,7 @@ void Image::drawLinieHTextur(Vec2<double> p,
     int* fc = this->fc + (int)(p.x + (int)p.y * br);
     double x = ta.x + txo * off, y = ta.y + tyo * off;
     int* buffer = textur.getBuffer();
-    int txtBr = textur.getBreite();
+    int txtBr = textur.getWidth();
     for (int i = 0; i < len; ++i, ++fc)
     {
         *fc = buffer[(int)((int)(x + 0.5) + (int)(y + 0.5) * txtBr)];
@@ -314,7 +314,7 @@ void Image::drawLineHTextureAlpha(Vec2<double> p,
     double tyo,
     const Image& textur) // draws a horizontal line
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     if (len < 0)
     {
         p.x += len;
@@ -343,18 +343,18 @@ void Image::drawLineHTextureAlpha(Vec2<double> p,
     int* fc = this->fc + (int)(p.x + (int)p.y * br);
     double x = ta.x + txo * off, y = ta.y + tyo * off;
     int* buffer = textur.getBuffer();
-    int txtBr = textur.getBreite();
+    int txtBr = textur.getWidth();
     int f;
     if (alpha3D)
     {
         for (int i = 0; i < len; ++i, ++fc)
         {
             f = buffer[(int)((int)(x + 0.5) + (int)(y + 0.5) * txtBr)];
-            if (alpha[alphaAnzahl])
+            if (alpha[alphaCount])
             {
                 unsigned char* cf = (unsigned char*)&f;
-                cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                        * (cf[3] - alpha[alphaAnzahl]));
+                cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                        * (cf[3] - alpha[alphaCount]));
             }
             alphaPixelP3D(*fc, f);
             x += txo, y += tyo;
@@ -365,11 +365,11 @@ void Image::drawLineHTextureAlpha(Vec2<double> p,
         for (int i = 0; i < len; ++i, ++fc)
         {
             f = buffer[(int)((int)(x + 0.5) + (int)(y + 0.5) * txtBr)];
-            if (alpha[alphaAnzahl])
+            if (alpha[alphaCount])
             {
                 unsigned char* cf = (unsigned char*)&f;
-                cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                        * (cf[3] - alpha[alphaAnzahl]));
+                cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                        * (cf[3] - alpha[alphaCount]));
             }
             alphaPixelP(*fc, f);
             x += txo, y += tyo;
@@ -406,58 +406,58 @@ void Image::setAlpha3D(bool erlaubt)
 void Image::setAlpha(
     unsigned char alpha) // sets the transparency for subsequent drawings
 {
-    int last = this->alpha[alphaAnzahl];
-    ++alphaAnzahl;
-    assert(alphaAnzahl < 1000);
-    this->alpha[alphaAnzahl]
+    int last = this->alpha[alphaCount];
+    ++alphaCount;
+    assert(alphaCount < 1000);
+    this->alpha[alphaCount]
         = (unsigned char)((255 - alpha) > last ? (255 - alpha) : last);
 }
 
 void Image::releaseAlpha() // Releases alpha
 {
-    --alphaAnzahl;
+    --alphaCount;
 }
 
 void Image::setPixelBuffer(int* buffer,
     bool deleteBuffer,
-    int breite,
+    int Width,
     int height) // sets the pointer to the image pixels
 {
     if (delFc) delete[] fc;
     fc = buffer;
     delFc = deleteBuffer;
-    size.x = breite;
+    size.x = Width;
     size.y = height;
     drawOff[0].x = 0;
     drawOff[0].y = 0;
     dPosA[0].x = 0;
     dPosA[0].y = 0;
     dSizeA[0] = size;
-    alphaAnzahl = 0;
+    alphaCount = 0;
     alpha[0] = 0;
     doa = 0;
     rend = 1;
 }
 
-void Image::neuImage(int breite, int height, int fillColor)
+void Image::newImage(int Width, int height, int fillColor)
 {
     if (fc && delFc) delete[] fc;
-    size.x = breite;
+    size.x = Width;
     size.y = height;
     fc = new int[size.x * size.y];
-    setFarbe(fillColor);
+    setColor(fillColor);
     drawOff[0].x = 0;
     drawOff[0].y = 0;
     dPosA[0].x = 0;
     dPosA[0].y = 0;
     dSizeA[0] = size;
-    alphaAnzahl = 0;
+    alphaCount = 0;
     alpha[0] = 0;
     doa = 0;
     rend = 1;
 }
 
-void Image::setFarbe(int f)
+void Image::setColor(int f)
 {
     if ((f & 0xFF) == ((f >> 8) & 0xFF) && (f & 0xFF) == ((f >> 16) & 0xFF)
         && (f & 0xFF) == ((f >> 24) & 0xFF))
@@ -472,8 +472,8 @@ void Image::setFarbe(int f)
 
 void Image::fillRegion(int x, int y, int b, int h, int ff)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
         alphaRegion(x, y, b, h, ff);
         return;
@@ -509,7 +509,7 @@ void Image::fillRegion(int x, int y, int b, int h, int ff)
 
 void Image::alphaRegion(int x, int y, int b, int h, int ff)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -529,11 +529,11 @@ void Image::alphaRegion(int x, int y, int b, int h, int ff)
     }
     b = (x + b) >= dgx ? (dgx - x) : b;
     h = (y + h) >= dgy ? (dgy - y) : h;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount])
     {
         unsigned char* cf = (unsigned char*)&ff;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
     }
     int* pixel = fc + y * size.x + x;
     int* rowEnd = pixel + b;
@@ -562,13 +562,13 @@ void Image::alphaRegion(int x, int y, int b, int h, int ff)
 
 void Image::alphaPixel2D(int i, int f)
 {
-    if (!alpha[alphaAnzahl])
+    if (!alpha[alphaCount])
         alphaPixelP(fc[i], f);
     else
     {
         unsigned char* cf = (unsigned char*)&f;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
         alphaPixelP(fc[i], f);
         rend = 1;
     }
@@ -576,13 +576,13 @@ void Image::alphaPixel2D(int i, int f)
 
 void Image::alphaPixel3D(int i, int f)
 {
-    if (!alpha[alphaAnzahl])
+    if (!alpha[alphaCount])
         alphaPixelP3D(fc[i], f);
     else
     {
         unsigned char* cf = (unsigned char*)&f;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
         alphaPixelP3D(fc[i], f);
         rend = 1;
     }
@@ -590,12 +590,12 @@ void Image::alphaPixel3D(int i, int f)
 
 void Image::alphaPixel2D(int x, int y, int f)
 {
-    if (!alpha[alphaAnzahl]) alphaPixelP(fc[x + y * size.x], f);
-    if (alpha[alphaAnzahl] < 0xFF)
+    if (!alpha[alphaCount]) alphaPixelP(fc[x + y * size.x], f);
+    if (alpha[alphaCount] < 0xFF)
     {
         unsigned char* cf = (unsigned char*)&f;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
         alphaPixelP(fc[x + y * size.x], f);
         rend = 1;
     }
@@ -603,12 +603,12 @@ void Image::alphaPixel2D(int x, int y, int f)
 
 void Image::alphaPixel3D(int x, int y, int f)
 {
-    if (!alpha[alphaAnzahl]) alphaPixelP3D(fc[x + y * size.x], f);
-    if (alpha[alphaAnzahl] < 0xFF)
+    if (!alpha[alphaCount]) alphaPixelP3D(fc[x + y * size.x], f);
+    if (alpha[alphaCount] < 0xFF)
     {
         unsigned char* cf = (unsigned char*)&f;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
         alphaPixelP3D(fc[x + y * size.x], f);
         rend = 1;
     }
@@ -616,7 +616,7 @@ void Image::alphaPixel3D(int x, int y, int f)
 
 void Image::alphaPixelDP2D(int x, int y, int f)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -624,11 +624,11 @@ void Image::alphaPixelDP2D(int x, int y, int f)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x < dpx || y < dpy || x >= dgx || y >= dgy) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount])
     {
         unsigned char* cf = (unsigned char*)&f;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
     }
     alphaPixelP(fc[x + y * size.x], f);
     rend = 1;
@@ -636,7 +636,7 @@ void Image::alphaPixelDP2D(int x, int y, int f)
 
 void Image::alphaPixelDP3D(int x, int y, int f)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -644,11 +644,11 @@ void Image::alphaPixelDP3D(int x, int y, int f)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x < dpx || y < dpy || x >= dgx || y >= dgy) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount])
     {
         unsigned char* cf = (unsigned char*)&f;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
     }
     alphaPixelP3D(fc[x + y * size.x], f);
     rend = 1;
@@ -672,8 +672,8 @@ void Image::alphaPixelDP3D(int i, int f)
 
 void Image::setPixelDP(int x, int y, int f)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
         if (alpha3D)
             alphaPixelDP3D(x, y, f);
@@ -700,13 +700,13 @@ void Image::setPixelDP(int i, int f)
     rend = 1;
 }
 
-void Image::drawLinieH(
+void Image::drawLineH(
     int x, int y, int len, int f) // draws a horizontal line
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
-        drawLinieHAlpha(x, y, len, f);
+        drawLineHAlpha(x, y, len, f);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -736,13 +736,13 @@ void Image::drawLinieH(
     rend = 1;
 }
 
-void Image::drawLinieV(
+void Image::drawLineV(
     int x, int y, int len, int f) // draws a vertical line
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
-        drawLinieVAlpha(x, y, len, f);
+        drawLineVAlpha(x, y, len, f);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -772,10 +772,10 @@ void Image::drawLinieV(
     rend = 1;
 }
 
-void Image::drawLinieHAlpha(
+void Image::drawLineHAlpha(
     int x, int y, int len, int f) // draws a horizontal line
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -798,11 +798,11 @@ void Image::drawLinieHAlpha(
     int pval = len < 0 ? -1 : 1;
     len = len > 0 ? len : -len;
     int end = 0;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount])
     {
         unsigned char* cf = (unsigned char*)&f;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
     }
     if (alpha3D)
     {
@@ -821,10 +821,10 @@ void Image::drawLinieHAlpha(
     rend = 1;
 }
 
-void Image::drawLinieVAlpha(
+void Image::drawLineVAlpha(
     int x, int y, int len, int f) // draws a vertical line
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -847,11 +847,11 @@ void Image::drawLinieVAlpha(
     int pval = len < 0 ? -br : br;
     len = len > 0 ? len : -len;
     int end = 0;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount])
     {
         unsigned char* cf = (unsigned char*)&f;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
     }
     if (alpha3D)
     {
@@ -870,12 +870,12 @@ void Image::drawLinieVAlpha(
     rend = 1;
 }
 
-void Image::drawLinieBordered(Punkt a, Punkt b, int bc, int fc)
+void Image::drawLineBordered(Point a, Point b, int bc, int fc)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
-        drawLinieBorderedAlpha(a, b, bc, fc);
+        drawLineBorderedAlpha(a, b, bc, fc);
         return;
     }
     a += drawOff[doa];
@@ -975,9 +975,9 @@ void Image::drawLinieBordered(Punkt a, Punkt b, int bc, int fc)
     }
 }
 
-void Image::drawLinieBorderedAlpha(Punkt a, Punkt b, int bc, int fc)
+void Image::drawLineBorderedAlpha(Point a, Point b, int bc, int fc)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     a += drawOff[doa];
     b += drawOff[doa];
     char outCode1 = getOutCode(a);
@@ -1045,11 +1045,11 @@ void Image::drawLinieBorderedAlpha(Punkt a, Punkt b, int bc, int fc)
         else
             yf = yf < 0 ? -1 : 1;
         double x = (double)a.x, y = (double)a.y;
-        if (alpha[alphaAnzahl])
+        if (alpha[alphaCount])
         {
             unsigned char* cf = (unsigned char*)&fc;
-            cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                    * (cf[3] - alpha[alphaAnzahl]));
+            cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                    * (cf[3] - alpha[alphaCount]));
         }
         int maxP = (int)(sqrt((float)(xlen * xlen + ylen * ylen)) + 0.5);
         int count = 0;
@@ -1142,14 +1142,14 @@ void Image::drawLinieBorderedAlpha(Punkt a, Punkt b, int bc, int fc)
     }
 }
 
-void Image::drawLinie(Punkt a,
-    Punkt b,
+void Image::drawLine(Point a,
+    Point b,
     int fc) // draws a line from Point(x1, y1) to Point(x2, y2)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
-        drawLinieAlpha(a, b, fc);
+        drawLineAlpha(a, b, fc);
         return;
     }
     a += drawOff[doa];
@@ -1233,9 +1233,9 @@ void Image::drawLinie(Punkt a,
     }
 }
 
-void Image::drawLinieAlpha(Punkt a, Punkt b, int fc)
+void Image::drawLineAlpha(Point a, Point b, int fc)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     a += drawOff[doa];
     b += drawOff[doa];
     char outCode1 = getOutCode(a);
@@ -1303,11 +1303,11 @@ void Image::drawLinieAlpha(Punkt a, Punkt b, int fc)
         else
             yf = yf < 0 ? -1 : 1;
         double x = (double)a.x, y = (double)a.y;
-        if (alpha[alphaAnzahl])
+        if (alpha[alphaCount])
         {
             unsigned char* cf = (unsigned char*)&fc;
-            cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                    * (cf[3] - alpha[alphaAnzahl]));
+            cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                    * (cf[3] - alpha[alphaCount]));
         }
         int maxP = (int)(sqrt((float)(xlen * xlen + ylen * ylen)) + 0.5);
         int count = 0;
@@ -1346,20 +1346,20 @@ void Image::fillCircle(int xOff,
     int r,
     int fc) // fills a circle around Point(xOff, yOff) with radius r
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     for (int i = r; i > 0; i--)
-        drawKreis(xOff, yOff, i, fc);
+        drawCircle(xOff, yOff, i, fc);
 }
 
-void Image::drawKreis(int xOff,
+void Image::drawCircle(int xOff,
     int yOff,
     int r,
     int fc) // draws a circle around Point(xOff, yOff) with radius r
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
-        drawKreisAlpha(xOff, yOff, r, fc);
+        drawCircleAlpha(xOff, yOff, r, fc);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -1401,9 +1401,9 @@ void Image::drawKreis(int xOff,
     rend = 1;
 }
 
-void Image::drawKreisAlpha(int xOff, int yOff, int r, int fc)
+void Image::drawCircleAlpha(int xOff, int yOff, int r, int fc)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -1412,11 +1412,11 @@ void Image::drawKreisAlpha(int xOff, int yOff, int r, int fc)
     yOff += drawOff[doa].y;
     if (xOff + r < dpx || xOff - r >= dgx || yOff + r < dpy || yOff - r >= dgy)
         return;
-    if (alpha[alphaAnzahl] < 0xFF)
+    if (alpha[alphaCount] < 0xFF)
     {
         unsigned char* cf = (unsigned char*)&fc;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
     }
     if (alpha3D)
     {
@@ -1536,8 +1536,8 @@ void Image::drawKreisAlpha(int xOff, int yOff, int r, int fc)
 void Image::drawImage(
     int x, int y, int br, int hi, const Image& zImage) // draws zImage
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
         alphaImage(x, y, br, hi, zImage);
         return;
@@ -1549,7 +1549,7 @@ void Image::drawImage(
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zImage.getBreite());
+    br = minInt(br, zImage.getWidth());
     hi = minInt(hi, zImage.getHeight());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
@@ -1557,7 +1557,7 @@ void Image::drawImage(
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
     int xx, ygr, ygr2;
     for (int yy = yst2; yy < dgy; ++yy)
@@ -1570,9 +1570,9 @@ void Image::drawImage(
     rend = 1;
 }
 
-void Image::alphaImageAssoz(int x, int y, int br, int hi, const Image& zImage)
+void Image::alphaImageAssoc(int x, int y, int br, int hi, const Image& zImage)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -1580,7 +1580,7 @@ void Image::alphaImageAssoz(int x, int y, int br, int hi, const Image& zImage)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zImage.getBreite());
+    br = minInt(br, zImage.getWidth());
     hi = minInt(hi, zImage.getHeight());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
@@ -1588,9 +1588,9 @@ void Image::alphaImageAssoz(int x, int y, int br, int hi, const Image& zImage)
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
-    if (!alpha[alphaAnzahl])
+    if (!alpha[alphaCount])
     {
         int xx, ygr, ygr2;
         for (int yy = yst2; yy < dgy; ++yy)
@@ -1612,8 +1612,8 @@ void Image::alphaImageAssoz(int x, int y, int br, int hi, const Image& zImage)
             {
                 int fc = ff[(xx - xst2 + xst) + ygr2];
                 unsigned char* cf = (unsigned char*)&fc;
-                cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                        * (cf[3] - alpha[alphaAnzahl]));
+                cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                        * (cf[3] - alpha[alphaCount]));
                 alphaPixelAssozP(this->fc[xx + ygr], fc);
             }
         }
@@ -1623,7 +1623,7 @@ void Image::alphaImageAssoz(int x, int y, int br, int hi, const Image& zImage)
 
 void Image::alphaImage(int x, int y, int br, int hi, const Image& zImage)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -1631,7 +1631,7 @@ void Image::alphaImage(int x, int y, int br, int hi, const Image& zImage)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zImage.getBreite());
+    br = minInt(br, zImage.getWidth());
     hi = minInt(hi, zImage.getHeight());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
@@ -1639,9 +1639,9 @@ void Image::alphaImage(int x, int y, int br, int hi, const Image& zImage)
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
-    if (!alpha[alphaAnzahl])
+    if (!alpha[alphaCount])
     {
         int xx, ygr, ygr2;
         if (alpha3D)
@@ -1682,8 +1682,8 @@ void Image::alphaImage(int x, int y, int br, int hi, const Image& zImage)
                 {
                     int fc = ff[(xx - xst2 + xst) + ygr2];
                     unsigned char* cf = (unsigned char*)&fc;
-                    cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                            * (cf[3] - alpha[alphaAnzahl]));
+                    cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                            * (cf[3] - alpha[alphaCount]));
                     alphaPixelP3D(this->fc[xx + ygr], fc);
                 }
             }
@@ -1698,8 +1698,8 @@ void Image::alphaImage(int x, int y, int br, int hi, const Image& zImage)
                 {
                     int fc = ff[(xx - xst2 + xst) + ygr2];
                     unsigned char* cf = (unsigned char*)&fc;
-                    cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                            * (cf[3] - alpha[alphaAnzahl]));
+                    cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                            * (cf[3] - alpha[alphaCount]));
                     alphaPixelP(this->fc[xx + ygr], fc);
                 }
             }
@@ -1714,8 +1714,8 @@ void Image::drawImage90(int x,
     int hi,
     const Image& zImage) // Draws an image rotated 90 degrees to the right
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
         alphaImage90(x, y, br, hi, zImage);
         return;
@@ -1728,14 +1728,14 @@ void Image::drawImage90(int x,
     y += drawOff[doa].y;
     if (x + hi < dpx || y + br < dpy || x >= dgx || y >= dgy) return;
     br = minInt(br, zImage.getHeight());
-    hi = minInt(hi, zImage.getBreite());
+    hi = minInt(hi, zImage.getWidth());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
     int yy, xbb;
     for (int xx = xst2; xx < dgx; ++xx)
@@ -1749,7 +1749,7 @@ void Image::drawImage90(int x,
 
 void Image::alphaImage90(int x, int y, int br, int hi, const Image& zImage)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -1758,16 +1758,16 @@ void Image::alphaImage90(int x, int y, int br, int hi, const Image& zImage)
     y += drawOff[doa].y;
     if (x + hi < dpx || y + br < dpy || x >= dgx || y >= dgy) return;
     br = minInt(br, zImage.getHeight());
-    hi = minInt(hi, zImage.getBreite());
+    hi = minInt(hi, zImage.getWidth());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
-    if (!alpha[alphaAnzahl])
+    if (!alpha[alphaCount])
     {
         int yy, xbb;
         if (alpha3D)
@@ -1801,8 +1801,8 @@ void Image::alphaImage90(int x, int y, int br, int hi, const Image& zImage)
                 {
                     int fc = ff[(yy - yst2 + yst) + xbb];
                     unsigned char* cf = (unsigned char*)&fc;
-                    cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                            * (cf[3] - alpha[alphaAnzahl]));
+                    cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                            * (cf[3] - alpha[alphaCount]));
                     alphaPixelP3D(xx, yy, fc);
                 }
             }
@@ -1816,8 +1816,8 @@ void Image::alphaImage90(int x, int y, int br, int hi, const Image& zImage)
                 {
                     int fc = ff[(yy - yst2 + yst) + xbb];
                     unsigned char* cf = (unsigned char*)&fc;
-                    cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                            * (cf[3] - alpha[alphaAnzahl]));
+                    cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                            * (cf[3] - alpha[alphaCount]));
                     alphaPixelP(xx, yy, fc);
                 }
             }
@@ -1832,8 +1832,8 @@ void Image::drawImage180(int x,
     int hi,
     const Image& zImage) // Draws an image rotated 180 degrees to the right
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
         alphaImage180(x, y, br, hi, zImage);
         return;
@@ -1845,7 +1845,7 @@ void Image::drawImage180(int x,
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zImage.getBreite());
+    br = minInt(br, zImage.getWidth());
     hi = minInt(hi, zImage.getHeight());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
@@ -1853,7 +1853,7 @@ void Image::drawImage180(int x,
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
     int xx, ygr, ybb;
     for (int yy = yst2; yy < dgy; ++yy)
@@ -1868,7 +1868,7 @@ void Image::drawImage180(int x,
 
 void Image::alphaImage180(int x, int y, int br, int hi, const Image& zImage)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -1877,16 +1877,16 @@ void Image::alphaImage180(int x, int y, int br, int hi, const Image& zImage)
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
     br = minInt(br, zImage.getHeight());
-    hi = minInt(hi, zImage.getBreite());
+    hi = minInt(hi, zImage.getWidth());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
-    if (!alpha[alphaAnzahl])
+    if (!alpha[alphaCount])
     {
         int xx, ygr, ybb;
         if (alpha3D)
@@ -1925,8 +1925,8 @@ void Image::alphaImage180(int x, int y, int br, int hi, const Image& zImage)
                 {
                     int fc = ff[(bb - (xx - xst2 + xst + 1)) + ybb];
                     unsigned char* cf = (unsigned char*)&fc;
-                    cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                            * (cf[3] - alpha[alphaAnzahl]));
+                    cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                            * (cf[3] - alpha[alphaCount]));
                     alphaPixelP3D(this->fc[xx + ygr], fc);
                 }
             }
@@ -1941,8 +1941,8 @@ void Image::alphaImage180(int x, int y, int br, int hi, const Image& zImage)
                 {
                     int fc = ff[(bb - (xx - xst2 + xst + 1)) + ybb];
                     unsigned char* cf = (unsigned char*)&fc;
-                    cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                            * (cf[3] - alpha[alphaAnzahl]));
+                    cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                            * (cf[3] - alpha[alphaCount]));
                     alphaPixelP(this->fc[xx + ygr], fc);
                 }
             }
@@ -1957,8 +1957,8 @@ void Image::drawImage270(int x,
     int hi,
     const Image& zImage) // Draws an image rotated 270 degrees to the right
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
         alphaImage270(x, y, br, hi, zImage);
         return;
@@ -1971,14 +1971,14 @@ void Image::drawImage270(int x,
     y += drawOff[doa].y;
     if (x + hi < dpx || y + br < dpy || x >= dgx || y >= dgy) return;
     br = minInt(br, zImage.getHeight());
-    hi = minInt(hi, zImage.getBreite());
+    hi = minInt(hi, zImage.getWidth());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
     int yy, xbb;
     for (int xx = xst2; xx < dgx; ++xx)
@@ -1992,7 +1992,7 @@ void Image::drawImage270(int x,
 
 void Image::alphaImage270(int x, int y, int br, int hi, const Image& zImage)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -2001,16 +2001,16 @@ void Image::alphaImage270(int x, int y, int br, int hi, const Image& zImage)
     y += drawOff[doa].y;
     if (x + hi < dpx || y + br < dpy || x >= dgx || y >= dgy) return;
     br = minInt(br, zImage.getHeight());
-    hi = minInt(hi, zImage.getBreite());
+    hi = minInt(hi, zImage.getWidth());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
-    if (!alpha[alphaAnzahl])
+    if (!alpha[alphaCount])
     {
         int yy, xbb;
         if (alpha3D)
@@ -2045,8 +2045,8 @@ void Image::alphaImage270(int x, int y, int br, int hi, const Image& zImage)
                 {
                     int fc = ff[(bb - (yy - yst2 + yst + 1)) + xbb];
                     unsigned char* cf = (unsigned char*)&fc;
-                    cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                            * (cf[3] - alpha[alphaAnzahl]));
+                    cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                            * (cf[3] - alpha[alphaCount]));
                     alphaPixelP3D(xx, yy, fc);
                 }
             }
@@ -2060,8 +2060,8 @@ void Image::alphaImage270(int x, int y, int br, int hi, const Image& zImage)
                 {
                     int fc = ff[(bb - (yy - yst2 + yst + 1)) + xbb];
                     unsigned char* cf = (unsigned char*)&fc;
-                    cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                            * (cf[3] - alpha[alphaAnzahl]));
+                    cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                            * (cf[3] - alpha[alphaCount]));
                     alphaPixelP(xx, yy, fc);
                 }
             }
@@ -2070,13 +2070,13 @@ void Image::alphaImage270(int x, int y, int br, int hi, const Image& zImage)
     rend = 1;
 }
 
-void Image::drawImageSkall(
+void Image::drawImageScaled(
     int x, int y, int br, int hi, const Image& zImage) // draws zImage scaled
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
-        alphaImageSkall(x, y, br, hi, zImage);
+        alphaImageScaled(x, y, br, hi, zImage);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -2086,7 +2086,7 @@ void Image::drawImageSkall(
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    double xo = zImage.getBreite() / (double)br;
+    double xo = zImage.getWidth() / (double)br;
     double yo = zImage.getHeight() / (double)hi;
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
@@ -2094,7 +2094,7 @@ void Image::drawImageSkall(
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
     int xx, ygr, ygr2;
     double xb = 0, yb = yst * yo;
@@ -2108,9 +2108,9 @@ void Image::drawImageSkall(
     rend = 1;
 }
 
-void Image::alphaImageSkall(int x, int y, int br, int hi, const Image& zImage)
+void Image::alphaImageScaled(int x, int y, int br, int hi, const Image& zImage)
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -2118,7 +2118,7 @@ void Image::alphaImageSkall(int x, int y, int br, int hi, const Image& zImage)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    double xo = zImage.getBreite() / (double)br;
+    double xo = zImage.getWidth() / (double)br;
     double yo = zImage.getHeight() / (double)hi;
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
@@ -2126,7 +2126,7 @@ void Image::alphaImageSkall(int x, int y, int br, int hi, const Image& zImage)
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zImage.getBreite();
+    int bb = zImage.getWidth();
     int* ff = zImage.getBuffer();
     int xx, ygr, ygr2;
     double xb = 0;
@@ -2140,8 +2140,8 @@ void Image::alphaImageSkall(int x, int y, int br, int hi, const Image& zImage)
             {
                 int f = ff[(int)xb + ygr2];
                 unsigned char* cf = (unsigned char*)&f;
-                cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                        * (cf[3] - alpha[alphaAnzahl]));
+                cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                        * (cf[3] - alpha[alphaCount]));
                 alphaPixelP3D(fc[xx + ygr], f);
             }
         }
@@ -2156,8 +2156,8 @@ void Image::alphaImageSkall(int x, int y, int br, int hi, const Image& zImage)
             {
                 int f = ff[(int)xb + ygr2];
                 unsigned char* cf = (unsigned char*)&f;
-                cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                        * (cf[3] - alpha[alphaAnzahl]));
+                cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                        * (cf[3] - alpha[alphaCount]));
                 alphaPixelP(fc[xx + ygr], f);
             }
         }
@@ -2165,13 +2165,13 @@ void Image::alphaImageSkall(int x, int y, int br, int hi, const Image& zImage)
     rend = 1;
 }
 
-void Image::drawDreieck(
-    Punkt a, Punkt b, Punkt c, int farbe) // fills a triangle
+void Image::drawTriangle(
+    Point a, Point b, Point c, int color) // fills a triangle
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
-        drawDreieckAlpha(a, b, c, farbe);
+        drawTriangleAlpha(a, b, c, color);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -2196,7 +2196,7 @@ void Image::drawDreieck(
         const float m3 = (float)(b.x - c.x) / (float)(b.y - c.y);
         float b2 = (float)a.x - m2 * (float)a.y;
         float b3 = (float)b.x - m3 * (float)b.y;
-        drawFlatDreieck(b.y, c.y, m2, b2, m3, b3, farbe);
+        drawFlatTriangle(b.y, c.y, m2, b2, m3, b3, color);
     }
     else if (b.y == c.y)
     {
@@ -2205,7 +2205,7 @@ void Image::drawDreieck(
         const float m2 = (float)(a.x - c.x) / (float)(a.y - c.y);
         float b1 = (float)a.x - m1 * (float)a.y;
         float b2 = (float)a.x - m2 * (float)a.y;
-        drawFlatDreieck(a.y, b.y, m1, b1, m2, b2, farbe);
+        drawFlatTriangle(a.y, b.y, m1, b1, m2, b2, color);
     }
     else
     {
@@ -2218,28 +2218,28 @@ void Image::drawDreieck(
         const float qx = m2 * (float)b.y + b2;
         if (qx < (float)b.x)
         {
-            drawFlatDreieck(a.y, b.y, m2, b2, m1, b1, farbe);
-            drawFlatDreieck(b.y, c.y, m2, b2, m3, b3, farbe);
+            drawFlatTriangle(a.y, b.y, m2, b2, m1, b1, color);
+            drawFlatTriangle(b.y, c.y, m2, b2, m3, b3, color);
         }
         else
         {
-            drawFlatDreieck(a.y, b.y, m1, b1, m2, b2, farbe);
-            drawFlatDreieck(b.y, c.y, m3, b3, m2, b2, farbe);
+            drawFlatTriangle(a.y, b.y, m1, b1, m2, b2, color);
+            drawFlatTriangle(b.y, c.y, m3, b3, m2, b2, color);
         }
     }
     rend = 1;
 }
 
-void Image::drawDreieckTextur(Punkt a,
-    Punkt b,
-    Punkt c,
-    Punkt ta,
-    Punkt tb,
-    Punkt tc,
+void Image::drawTriangleTexture(Point a,
+    Point b,
+    Point c,
+    Point ta,
+    Point tb,
+    Point tc,
     const Image& textur) // fills a triangle
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount] == 0xFF) return;
+    if (alpha[alphaCount])
     {
         drawTriangleTextureAlpha(a, b, c, ta, tb, tc, textur);
         return;
@@ -2313,7 +2313,7 @@ void Image::drawDreieckTextur(Punkt a,
             txf = 0;
             tyf = 0;
         }
-        drawFlatDreieckTextur(a.y,
+        drawFlatTriangleTexture(a.y,
             b.y,
             m2,
             b2,
@@ -2340,7 +2340,7 @@ void Image::drawDreieckTextur(Punkt a,
             tx2o = 0;
             ty2o = 0;
         }
-        drawFlatDreieckTextur(b.y,
+        drawFlatTriangleTexture(b.y,
             c.y,
             m2,
             b2,
@@ -2393,7 +2393,7 @@ void Image::drawDreieckTextur(Punkt a,
             txf = 0;
             tyf = 0;
         }
-        drawFlatDreieckTextur(a.y,
+        drawFlatTriangleTexture(a.y,
             b.y,
             m1,
             b1,
@@ -2420,7 +2420,7 @@ void Image::drawDreieckTextur(Punkt a,
             tx1o = 0;
             ty1o = 0;
         }
-        drawFlatDreieckTextur(b.y,
+        drawFlatTriangleTexture(b.y,
             c.y,
             m3,
             b3,
@@ -2441,10 +2441,10 @@ void Image::drawDreieckTextur(Punkt a,
     rend = 1;
 }
 
-void Image::drawDreieckAlpha(
-    Punkt a, Punkt b, Punkt c, int farbe) // fills a triangle
+void Image::drawTriangleAlpha(
+    Point a, Point b, Point c, int color) // fills a triangle
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -2457,11 +2457,11 @@ void Image::drawDreieckAlpha(
         || (a.x >= dgx && b.x >= dgx && c.x >= dgx)
         || (a.y >= dgy && b.y >= dgy && c.y >= dgy))
         return;
-    if (alpha[alphaAnzahl])
+    if (alpha[alphaCount])
     {
-        unsigned char* cf = (unsigned char*)&farbe;
-        cf[3] = (unsigned char)((cf[3] > alpha[alphaAnzahl])
-                                * (cf[3] - alpha[alphaAnzahl]));
+        unsigned char* cf = (unsigned char*)&color;
+        cf[3] = (unsigned char)((cf[3] > alpha[alphaCount])
+                                * (cf[3] - alpha[alphaCount]));
     }
     if (b.y < a.y) a.Swap(b);
     if (c.y < b.y) b.Swap(c);
@@ -2473,7 +2473,7 @@ void Image::drawDreieckAlpha(
         const float m3 = (float)(b.x - c.x) / (float)(b.y - c.y);
         float b2 = (float)a.x - m2 * (float)a.y;
         float b3 = (float)b.x - m3 * (float)b.y;
-        drawFlatDreieckAlpha(b.y, c.y, m2, b2, m3, b3, farbe);
+        drawFlatTriangleAlpha(b.y, c.y, m2, b2, m3, b3, color);
     }
     else if (b.y == c.y)
     {
@@ -2482,7 +2482,7 @@ void Image::drawDreieckAlpha(
         const float m2 = (float)(a.x - c.x) / (float)(a.y - c.y);
         float b1 = (float)a.x - m1 * (float)a.y;
         float b2 = (float)a.x - m2 * (float)a.y;
-        drawFlatDreieckAlpha(a.y, b.y, m1, b1, m2, b2, farbe);
+        drawFlatTriangleAlpha(a.y, b.y, m1, b1, m2, b2, color);
     }
     else
     {
@@ -2495,27 +2495,27 @@ void Image::drawDreieckAlpha(
         const float qx = m2 * (float)b.y + b2;
         if (qx < (float)b.x)
         {
-            drawFlatDreieckAlpha(a.y, b.y, m2, b2, m1, b1, farbe);
-            drawFlatDreieckAlpha(b.y, c.y, m2, b2, m3, b3, farbe);
+            drawFlatTriangleAlpha(a.y, b.y, m2, b2, m1, b1, color);
+            drawFlatTriangleAlpha(b.y, c.y, m2, b2, m3, b3, color);
         }
         else
         {
-            drawFlatDreieckAlpha(a.y, b.y, m1, b1, m2, b2, farbe);
-            drawFlatDreieckAlpha(b.y, c.y, m3, b3, m2, b2, farbe);
+            drawFlatTriangleAlpha(a.y, b.y, m1, b1, m2, b2, color);
+            drawFlatTriangleAlpha(b.y, c.y, m3, b3, m2, b2, color);
         }
     }
     rend = 1;
 }
 
-void Image::drawTriangleTextureAlpha(Punkt a,
-    Punkt b,
-    Punkt c,
-    Punkt ta,
-    Punkt tb,
-    Punkt tc,
+void Image::drawTriangleTextureAlpha(Point a,
+    Point b,
+    Point c,
+    Point ta,
+    Point tb,
+    Point tc,
     const Image& textur) // fills a triangle
 {
-    if (alpha[alphaAnzahl] == 0xFF) return;
+    if (alpha[alphaCount] == 0xFF) return;
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
     int dgx = dSizeA[doa].x;
@@ -2585,7 +2585,7 @@ void Image::drawTriangleTextureAlpha(Punkt a,
             txf = 0;
             tyf = 0;
         }
-        drawFlatDreieckTexturAlpha(a.y,
+        drawFlatTriangleTextureAlpha(a.y,
             b.y,
             m2,
             b2,
@@ -2612,7 +2612,7 @@ void Image::drawTriangleTextureAlpha(Punkt a,
             tx2o = 0;
             ty2o = 0;
         }
-        drawFlatDreieckTexturAlpha(b.y,
+        drawFlatTriangleTextureAlpha(b.y,
             c.y,
             m2,
             b2,
@@ -2665,7 +2665,7 @@ void Image::drawTriangleTextureAlpha(Punkt a,
             txf = 0;
             tyf = 0;
         }
-        drawFlatDreieckTexturAlpha(a.y,
+        drawFlatTriangleTextureAlpha(a.y,
             b.y,
             m1,
             b1,
@@ -2692,7 +2692,7 @@ void Image::drawTriangleTextureAlpha(Punkt a,
             tx1o = 0;
             ty1o = 0;
         }
-        drawFlatDreieckTexturAlpha(b.y,
+        drawFlatTriangleTextureAlpha(b.y,
             c.y,
             m3,
             b3,
@@ -2737,7 +2737,7 @@ void Image::replaceColorWithAlpha(int color)
 }
 
 bool Image::setDrawOptions(
-    const Punkt& pos, const Punkt& gr) // sets the draw options
+    const Point& pos, const Point& gr) // sets the draw options
 {
     int dx = drawOff[doa].x, dy = drawOff[doa].y;
     int xx = dPosA[doa].x, yy = dPosA[doa].y;
@@ -2781,7 +2781,7 @@ bool Image::setDrawOptions(int x, int y, int br, int hi)
 }
 
 bool Image::setDrawOptionsErzwingen(
-    const Punkt& pos, const Punkt& gr) // sets the draw options
+    const Point& pos, const Point& gr) // sets the draw options
 {
     int dx = drawOff[doa].x, dy = drawOff[doa].y;
     if (dx + pos.x + gr.x < 0 || dy + pos.y + gr.y < 0 || dx + pos.x >= size.x
@@ -2838,7 +2838,7 @@ void Image::releaseDrawOptions() // resets the draw options
     --doa;
 }
 
-bool Image::getRend()
+bool Image::getNeedRender()
 {
     bool ret = rend;
     rend = 0;
@@ -2857,12 +2857,12 @@ int Image::getPixel(int x, int y) const
     return fc[x + y * size.x];
 }
 
-const Punkt& Image::getSize() const // returns the size
+const Point& Image::getSize() const // returns the size
 {
     return size;
 }
 
-int Image::getBreite() const // returns the width
+int Image::getWidth() const // returns the width
 {
     return size.x;
 }
@@ -2874,20 +2874,20 @@ int Image::getHeight() const // returns the height
 
 unsigned char Image::getAlpha() const // returns the alpha value
 {
-    return (unsigned char)(255 - alpha[alphaAnzahl]);
+    return (unsigned char)(255 - alpha[alphaCount]);
 }
 
-const Punkt& Image::getDrawPos() const
+const Point& Image::getDrawPos() const
 {
     return dPosA[doa];
 }
 
-const Punkt& Image::getDrawGr() const
+const Point& Image::getDrawGr() const
 {
     return dSizeA[doa];
 }
 
-const Punkt& Image::getDrawOff() const
+const Point& Image::getDrawOff() const
 {
     return drawOff[doa];
 }
@@ -2941,22 +2941,22 @@ void ImageView::doMouseEvent(MouseEvent& me, bool userRet) // calls Mak
     if (userRet)
     {
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
-        bool vs = hatStyle(Style::VScroll) && vertikalScrollBar;
-        bool hs = hatStyle(Style::HScroll) && horizontalScrollBar;
+        if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
+        bool vs = hasStyle(Style::VScroll) && vertikalScrollBar;
+        bool hs = hasStyle(Style::HScroll) && horizontalScrollBar;
         if (vs)
         {
             if (hs)
-                horizontalScrollBar->doMausMessage(
+                horizontalScrollBar->doMouseMessage(
                     rbr, gr.y - rbr - 15, gr.x - rbr * 2 - 15, 15, me);
-            vertikalScrollBar->doMausMessage(
+            vertikalScrollBar->doMouseMessage(
                 gr.x - rbr - 15, rbr, 15, gr.y - rbr * 2, me);
         }
         else if (hs)
-            horizontalScrollBar->doMausMessage(
+            horizontalScrollBar->doMouseMessage(
                 rbr, gr.y - rbr - 15, gr.x - rbr * 2, 15, me);
     }
-    me.verarbeitet = userRet;
+    me.processed = userRet;
 }
 
 // non-constant
@@ -2968,7 +2968,7 @@ void ImageView::setImageZ(Image* b) // sets the image
     if (!horizontalScrollBar) horizontalScrollBar = new HScrollBar();
     if (b)
     {
-        horizontalScrollBar->getScrollData()->max = b->getBreite();
+        horizontalScrollBar->getScrollData()->max = b->getWidth();
         vertikalScrollBar->getScrollData()->max = b->getHeight();
     }
     rend = 1;
@@ -2977,11 +2977,11 @@ void ImageView::setImageZ(Image* b) // sets the image
 void ImageView::setImage(Image* b)
 {
     if (!bild) bild = new Image();
-    bild->neuImage(b->getBreite(), b->getHeight(), 0);
-    bild->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
+    bild->newImage(b->getWidth(), b->getHeight(), 0);
+    bild->drawImage(0, 0, b->getWidth(), b->getHeight(), *b);
     if (!vertikalScrollBar) vertikalScrollBar = new VScrollBar();
     if (!horizontalScrollBar) horizontalScrollBar = new HScrollBar();
-    horizontalScrollBar->getScrollData()->max = b->getBreite();
+    horizontalScrollBar->getScrollData()->max = b->getWidth();
     vertikalScrollBar->getScrollData()->max = b->getHeight();
     b->release();
     rend = 1;
@@ -2994,7 +2994,7 @@ bool ImageView::tick(double tickVal) // tick
 
 void ImageView::render(Image& zRObj) // draws to zRObj
 {
-    if (hatStyle(Style::Sichtbar))
+    if (hasStyle(Style::Visible))
     {
         DrawableBackground::render(zRObj);
         lockDrawable();
@@ -3009,20 +3009,20 @@ void ImageView::render(Image& zRObj) // draws to zRObj
             int y = 0;
             int br = innenSize.x;
             int hi = innenSize.y;
-            if (!(vertikalScrollBar && hatStyle(Style::VScroll))
-                && !(horizontalScrollBar && hatStyle(Style::HScroll)))
+            if (!(vertikalScrollBar && hasStyle(Style::VScroll))
+                && !(horizontalScrollBar && hasStyle(Style::HScroll)))
             {
-                if (hatStyle(Style::Alpha))
+                if (hasStyle(Style::Alpha))
                 {
-                    if (hatStyle(Style::Skalliert))
-                        zRObj.alphaImageSkall(x, y, br, hi, *bild);
+                    if (hasStyle(Style::Scaled))
+                        zRObj.alphaImageScaled(x, y, br, hi, *bild);
                     else
                         zRObj.alphaImage(x, y, br, hi, *bild);
                 }
                 else
                 {
-                    if (hatStyle(Style::Skalliert))
-                        zRObj.drawImageSkall(x, y, br, hi, *bild);
+                    if (hasStyle(Style::Scaled))
+                        zRObj.drawImageScaled(x, y, br, hi, *bild);
                     else
                         zRObj.drawImage(x, y, br, hi, *bild);
                 }
@@ -3035,16 +3035,16 @@ void ImageView::render(Image& zRObj) // draws to zRObj
                     unlockDrawable();
                     return;
                 }
-                if (hatStyle(Style::Alpha))
+                if (hasStyle(Style::Alpha))
                     zRObj.alphaImage(-horizontalScrollBar->getScroll(),
                         -vertikalScrollBar->getScroll(),
-                        bild->getBreite(),
+                        bild->getWidth(),
                         bild->getHeight(),
                         *bild);
                 else
                     zRObj.drawImage(-horizontalScrollBar->getScroll(),
                         -vertikalScrollBar->getScroll(),
-                        bild->getBreite(),
+                        bild->getWidth(),
                         bild->getHeight(),
                         *bild);
                 zRObj.releaseDrawOptions();
@@ -3067,7 +3067,7 @@ Image* ImageView::zImage() const
     return bild;
 }
 
-Drawable* ImageView::dublizieren() const // creates a copy of the drawing
+Drawable* ImageView::duplicate() const // creates a copy of the drawing
 {
     ImageView* obj = new ImageView();
     obj->setPosition(pos);
@@ -3076,27 +3076,27 @@ Drawable* ImageView::dublizieren() const // creates a copy of the drawing
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setStyle(style);
-    obj->setHintergrundFarbe(hintergrundFarbe);
-    if (hintergrundFeld)
-        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
-    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
-    if (hintergrundImage)
-        obj->setHintergrundImage(
-            dynamic_cast<Image*>(hintergrundImage->getThis()));
+    obj->setBackgroundColor(backgroundColor);
+    if (backgroundFeld)
+        obj->setAlphaFieldZ((AlphaField*)backgroundFeld->duplicate());
+    if (border) obj->setBorderZ((Border*)border->duplicate());
+    if (backgroundImage)
+        obj->setBackgroundImage(
+            dynamic_cast<Image*>(backgroundImage->getThis()));
     if (bild) obj->setImage(dynamic_cast<Image*>(bild->getThis()));
     obj->setStyle(style);
     return obj;
 }
 
 #ifdef WIN32
-Image* Framework::ladeImage(const char* pfad, Text* zError)
+Image* Framework::loadImage(const char* pfad, Text* zError)
 {
     Text p = pfad;
-    Text* txt = p.getTeilText(p.positionVon('.', p.anzahlVon('.') - 1));
-    if (!(txt->istGleich(".bmp") || txt->istGleich(".jpg")
-            || txt->istGleich(".gif") || txt->istGleich(".png")))
+    Text* txt = p.getTeilText(p.positionOf('.', p.countOf('.') - 1));
+    if (!(txt->isEqual(".bmp") || txt->isEqual(".jpg")
+            || txt->isEqual(".gif") || txt->isEqual(".png")))
     {
         zError->setText("Die Angegebene File ist keine gueltige ImageFile!");
         txt->release();
@@ -3113,7 +3113,7 @@ Image* Framework::ladeImage(const char* pfad, Text* zError)
     delete[] name;
 
     Image* ret = new Image();
-    ret->neuImage(bitmap.GetWidth(), bitmap.GetHeight(), 0);
+    ret->newImage(bitmap.GetWidth(), bitmap.GetHeight(), 0);
     int* buff = ret->getBuffer();
     for (unsigned int i = 0; i < bitmap.GetWidth() * bitmap.GetHeight(); i++)
     {

Image.h

@@ -23,13 +23,13 @@ namespace Framework
     private:
         int* fc;
         bool delFc;
-        Punkt size;
-        Punkt* drawOff;
-        Punkt* dPosA;
-        Punkt* dSizeA;
+        Point size;
+        Point* drawOff;
+        Point* dPosA;
+        Point* dSizeA;
         int doa;
         unsigned char* alpha;
-        int alphaAnzahl;
+        int alphaCount;
         bool rend;
         bool alpha3D;
 
@@ -39,10 +39,10 @@ namespace Framework
         inline void alphaPixelP(int& fc, int f);
         inline void alphaPixelP3D(int& fc, int f);
         inline void alphaPixelAssozP(int& fc, int f);
-        inline char getOutCode(Punkt p) const;
-        void drawFlatDreieck(
-            int y1, int y2, float m1, float b1, float m2, float b2, int farbe);
-        void drawFlatDreieckTextur(int y1,
+        inline char getOutCode(Point p) const;
+        void drawFlatTriangle(
+            int y1, int y2, float m1, float b1, float m2, float b2, int color);
+        void drawFlatTriangleTexture(int y1,
             int y2,
             double m1,
             double b1,
@@ -59,9 +59,9 @@ namespace Framework
             double txf,
             double tyf,
             const Image& textur);
-        void drawFlatDreieckAlpha(
-            int y1, int y2, float m1, float b1, float m2, float b2, int farbe);
-        void drawFlatDreieckTexturAlpha(int y1,
+        void drawFlatTriangleAlpha(
+            int y1, int y2, float m1, float b1, float m2, float b2, int color);
+        void drawFlatTriangleTextureAlpha(int y1,
             int y2,
             double m1,
             double b1,
@@ -78,7 +78,7 @@ namespace Framework
             double txf,
             double tyf,
             const Image& textur);
-        void drawLinieHTextur(Vec2<double> p,
+        void drawLineHTexture(Vec2<double> p,
             double length,
             Vec2<double> ta,
             Vec2<double> tb,
@@ -120,15 +120,15 @@ namespace Framework
         //! Sets a pointer to the pixels to draw into
         //! \param buffer An array with A8R8G8B8 color values
         //! \param deleteBuffer 1 if the array should be deleted by the image
-        //! \param breite The width in pixels
+        //! \param Width The width in pixels
         //! \param height The height in pixels
         DLLEXPORT void setPixelBuffer(
-            int* buffer, bool deleteBuffer, int breite, int height);
+            int* buffer, bool deleteBuffer, int Width, int height);
         //! Creates a new image
-        //! \param breite The width of the image in pixels
-        //! \param hoehe The height of the image in pixels
+        //! \param Width The width of the image in pixels
+        //! \param height The height of the image in pixels
         //! \param fillColor The initial color all pixels are set to
-        DLLEXPORT void neuImage(int breite, int height, int fillColor);
+        DLLEXPORT void newImage(int Width, int height, int fillColor);
         //! Blends a color onto a specific pixel using alpha blending.
         //! Does not respect the drawing area boundary or scroll offset
         //! \param x The X coordinate of the pixel
@@ -164,7 +164,7 @@ namespace Framework
         DLLEXPORT void setPixelDP(int i, int f);
         //! Sets the color of all pixels in the image
         //! \param f The new color
-        DLLEXPORT void setFarbe(int f);
+        DLLEXPORT void setColor(int f);
         //! Sets the colors of all pixels in a rectangle
         //! \param x The X coordinate
         //! \param y The Y coordinate
@@ -184,47 +184,47 @@ namespace Framework
         //! \param y The Y coordinate of the starting point
         //! \param length The length of the line
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawLinieH(int x, int y, int length, int fc);
+        DLLEXPORT void drawLineH(int x, int y, int length, int fc);
         //! Draws a vertical line
         //! \param x The X coordinate of the starting point
         //! \param y The Y coordinate of the starting point
         //! \param length The length of the line
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawLinieV(int x, int y, int length, int fc);
+        DLLEXPORT void drawLineV(int x, int y, int length, int fc);
         //! Draws a horizontal line with alpha blending
         //! \param x The X coordinate of the starting point
         //! \param y The Y coordinate of the starting point
         //! \param length The length of the line
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawLinieHAlpha(int x, int y, int length, int fc);
+        DLLEXPORT void drawLineHAlpha(int x, int y, int length, int fc);
         //! Draws a vertical line with alpha blending
         //! \param x The X coordinate of the starting point
         //! \param y The Y coordinate of the starting point
         //! \param length The length of the line
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawLinieVAlpha(int x, int y, int length, int fc);
+        DLLEXPORT void drawLineVAlpha(int x, int y, int length, int fc);
         //! Draws a bordered line
         //! \param a The starting point of the line
         //! \param b The ending point of the line
         //! \param bc The border color in A8R8G8B8 format
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawLinieBordered(Punkt a, Punkt b, int bc, int fc);
+        DLLEXPORT void drawLineBordered(Point a, Point b, int bc, int fc);
         //! Draws a bordered line with alpha blending
         //! \param a The starting point of the line
         //! \param b The ending point of the line
         //! \param bc The border color in A8R8G8B8 format
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawLinieBorderedAlpha(Punkt a, Punkt b, int bc, int fc);
+        DLLEXPORT void drawLineBorderedAlpha(Point a, Point b, int bc, int fc);
         //! Draws a line
         //! \param a The starting point of the line
         //! \param b The ending point of the line
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawLinie(Punkt a, Punkt b, int fc);
+        DLLEXPORT void drawLine(Point a, Point b, int fc);
         //! Draws a line with alpha blending
         //! \param a The starting point of the line
         //! \param b The ending point of the line
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawLinieAlpha(Punkt a, Punkt b, int fc);
+        DLLEXPORT void drawLineAlpha(Point a, Point b, int fc);
         //! Fills a circle with a color. (Unfinished)
         //! \param xOff The X coordinate of the circle center
         //! \param yOff The Y coordinate of the circle center
@@ -236,13 +236,13 @@ namespace Framework
         //! \param yOff The Y coordinate of the circle center
         //! \param r The radius of the circle in pixels
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawKreis(int xOff, int yOff, int r, int fc);
+        DLLEXPORT void drawCircle(int xOff, int yOff, int r, int fc);
         //! Draws the outline of a circle with alpha blending
         //! \param xOff The X coordinate of the circle center
         //! \param yOff The Y coordinate of the circle center
         //! \param r The radius of the circle in pixels
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void drawKreisAlpha(int xOff, int yOff, int r, int fc);
+        DLLEXPORT void drawCircleAlpha(int xOff, int yOff, int r, int fc);
         //! Draws an image into a specific area without scaling
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
@@ -267,7 +267,7 @@ namespace Framework
         //! \param br The width of the target area
         //! \param hi The height of the target area
         //! \param zImage The image to be drawn
-        DLLEXPORT void alphaImageAssoz(
+        DLLEXPORT void alphaImageAssoc(
             int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image rotated 90 degrees clockwise into a specific area
         //! without scaling
@@ -329,7 +329,7 @@ namespace Framework
         //! \param br The width of the target area
         //! \param hi The height of the target area
         //! \param zImage The image to be drawn
-        DLLEXPORT void drawImageSkall(
+        DLLEXPORT void drawImageScaled(
             int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image into a specific area with scaling and alpha blending
         //! \param x The X coordinate of the top left corner of the target area
@@ -337,14 +337,14 @@ namespace Framework
         //! \param br The width of the target area
         //! \param hi The height of the target area
         //! \param zImage The image to be drawn
-        DLLEXPORT void alphaImageSkall(
+        DLLEXPORT void alphaImageScaled(
             int x, int y, int br, int hi, const Image& zImage);
         //! Fills a triangle with a specific color
         //! \param a A corner of the triangle
         //! \param b A corner of the triangle
         //! \param c A corner of the triangle
-        //! \param farbe The color in A8R8G8B8 format
-        DLLEXPORT void drawDreieck(Punkt a, Punkt b, Punkt c, int farbe);
+        //! \param color The color in A8R8G8B8 format
+        DLLEXPORT void drawTriangle(Point a, Point b, Point c, int color);
         //! Fills a triangle with a specific texture
         //! \param a A corner of the triangle
         //! \param b A corner of the triangle
@@ -353,19 +353,19 @@ 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 drawDreieckTextur(Punkt a,
-            Punkt b,
-            Punkt c,
-            Punkt ta,
-            Punkt tb,
-            Punkt tc,
+        DLLEXPORT void drawTriangleTexture(Point a,
+            Point b,
+            Point c,
+            Point ta,
+            Point tb,
+            Point tc,
             const Image& textur);
         //! Fills a triangle with a specific color with alpha blending
         //! \param a A corner of the triangle
         //! \param b A corner of the triangle
         //! \param c A corner of the triangle
-        //! \param farbe The color in A8R8G8B8 format
-        DLLEXPORT void drawDreieckAlpha(Punkt a, Punkt b, Punkt c, int farbe);
+        //! \param color The color in A8R8G8B8 format
+        DLLEXPORT void drawTriangleAlpha(Point a, Point b, Point c, int color);
         //! Fills a triangle with a specific texture with alpha blending
         //! \param a A corner of the triangle
         //! \param b A corner of the triangle
@@ -374,12 +374,12 @@ 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 drawTriangleTextureAlpha(Punkt a,
-            Punkt b,
-            Punkt c,
-            Punkt ta,
-            Punkt tb,
-            Punkt tc,
+        DLLEXPORT void drawTriangleTextureAlpha(Point a,
+            Point b,
+            Point c,
+            Point ta,
+            Point tb,
+            Point tc,
             const Image& textur);
         //! Replaces a specific color with transparency
         DLLEXPORT void replaceColorWithAlpha(int color);
@@ -392,7 +392,7 @@ namespace Framework
         //! \return 1 if the new drawing area is fully or partially within the
         //! existing drawing area. If 0 is returned, the drawing area was not set
         //! and releaseDrawOptions() does not need to be called
-        DLLEXPORT bool setDrawOptions(const Punkt& pos, const Punkt& gr);
+        DLLEXPORT bool setDrawOptions(const Point& pos, const Point& gr);
         //! Restricts the drawing area until the next call of
         //! releaseDrawOptions(). Everything outside the area is automatically
         //! ignored. If the drawing area extends beyond an existing drawing area,
@@ -414,7 +414,7 @@ namespace Framework
         //! image. If 0 is returned, the drawing area was not set and
         //! releaseDrawOptions() does not need to be called
         DLLEXPORT bool setDrawOptionsErzwingen(
-            const Punkt& pos, const Punkt& gr);
+            const Point& pos, const Point& gr);
         //! Restricts the drawing area until the next call of
         //! releaseDrawOptions(). Everything outside the area is automatically
         //! ignored. The drawing area may extend beyond an existing drawing area.
@@ -441,7 +441,7 @@ namespace Framework
         DLLEXPORT void releaseDrawOptions();
         //! Returns whether the image has changed since the last call of this
         //! function
-        DLLEXPORT bool getRend();
+        DLLEXPORT bool getNeedRender();
         //! Returns the array of A8R8G8B8 pixel color values.
         //! The index of a pixel is calculated as x + y * image width
         DLLEXPORT int* getBuffer() const;
@@ -450,20 +450,20 @@ namespace Framework
         //! \param y The Y coordinate of the pixel
         DLLEXPORT int getPixel(int x, int y) const;
         //! Returns the size of the image
-        DLLEXPORT const Punkt& getSize() const;
+        DLLEXPORT const Point& getSize() const;
         //! Returns the width of the image
-        DLLEXPORT int getBreite() const;
+        DLLEXPORT int getWidth() const;
         //! Returns the height of the image
         DLLEXPORT int getHeight() const;
         //! Returns the current minimum transparency value
         DLLEXPORT unsigned char getAlpha() const;
         //! Returns the coordinates of the top left corner of the current
         //! drawing area
-        DLLEXPORT const Punkt& getDrawPos() const;
+        DLLEXPORT const Point& getDrawPos() const;
         //! Returns the size of the current drawing area
-        DLLEXPORT const Punkt& getDrawGr() const;
+        DLLEXPORT const Point& getDrawGr() const;
         //! Returns the coordinates added to all positions before drawing
-        DLLEXPORT const Punkt& getDrawOff() const;
+        DLLEXPORT const Point& getDrawOff() const;
         //! If this flag is set, when alpha blending and the previous color
         //! is 0, the new color is only copied with its alpha value.
         //! This is useful for use in the 3D screen, where the drawn image
@@ -485,12 +485,12 @@ namespace Framework
             //! the image
             static const __int64 Alpha = 0x1000;
             //! If this flag is set, the image is scaled to the drawing area
-            static const __int64 Skalliert = 0x2000;
+            static const __int64 Scaled = 0x2000;
 
             //! The normal style of an image drawing consisting of HScroll,
-            //! Sichtbar, Erlaubt, Border, VScroll
+            //! Visible, Allowed, Border, VScroll
             static const __int64 normal
-                = HScroll | Sichtbar | Erlaubt | Border | VScroll;
+                = HScroll | Visible | Allowed | Border | VScroll;
         };
 
     private:
@@ -526,7 +526,7 @@ namespace Framework
         DLLEXPORT Image* zImage() const;
         //! Copies the complete drawing so it can be modified without
         //! affecting the original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 
 #ifdef WIN32
@@ -535,7 +535,7 @@ namespace Framework
     //! \param zError A pointer to a Text object where a possible error is
     //! returned
     //! \return The loaded image
-    DLLEXPORT Image* ladeImage(const char* pfad, Text* zError);
+    DLLEXPORT Image* loadImage(const char* pfad, Text* zError);
 #endif
 } // namespace Framework
 #endif

InMemoryBuffer.cpp

@@ -26,7 +26,7 @@ InMemoryBuffer::~InMemoryBuffer()
 //! Reads from the resource
 //! \param bytes An array to be filled with bytes from the resource
 //! \param len How many bytes should be read from the resource
-void InMemoryBuffer::lese(char* bytes, int len)
+void InMemoryBuffer::read(char* bytes, int len)
 {
     if (readPos < writePos)
     {
@@ -47,7 +47,7 @@ void InMemoryBuffer::lese(char* bytes, int len)
 //! Writes to the resource
 //! \param bytes An array containing the bytes to be written to the resource
 //! \param len How many bytes should be written to the resource
-void InMemoryBuffer::schreibe(const char* bytes, int len)
+void InMemoryBuffer::write(const char* bytes, int len)
 {
     if (numBuffers * 256 < writePos + len)
     {
@@ -76,13 +76,13 @@ void InMemoryBuffer::schreibe(const char* bytes, int len)
 
 //! Reads the next line of the resource
 //! \return The read line as Text with line break
-Text* InMemoryBuffer::leseZeile()
+Text* InMemoryBuffer::readLine()
 {
-    if (istEnde()) return 0;
+    if (isEnd()) return 0;
     Text* ret = new Text("");
     for (char c = 0; c != '\n' && readPos < writePos;)
     {
-        lese(&c, 1);
+        read(&c, 1);
         if (c) ret->append(&c, 1);
     }
     return ret;
@@ -90,7 +90,7 @@ Text* InMemoryBuffer::leseZeile()
 
 //! Checks whether the resource has been fully read
 //!  return 1 if the resource has been fully read. 0 otherwise
-bool InMemoryBuffer::istEnde() const
+bool InMemoryBuffer::isEnd() const
 {
     return readPos < writePos;
 }

InMemoryBuffer.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "Reader.h"
 #include "ReferenceCounter.h"
@@ -23,18 +23,18 @@ namespace Framework
         //! Reads from the resource
         //! \param bytes An array to be filled with bytes from the resource
         //! \param len How many bytes should be read from the resource
-        DLLEXPORT void lese(char* bytes, int len) override;
+        DLLEXPORT void read(char* bytes, int len) override;
         //! Writes to the resource
         //! \param bytes An array containing the bytes to be written to the
         //! resource
         //! \param len How many bytes should be written to the resource
-        DLLEXPORT void schreibe(const char* bytes, int len) override;
+        DLLEXPORT void write(const char* bytes, int len) override;
         //! Reads the next line of the resource
         //! \return The read line as Text with line break
-        DLLEXPORT Text* leseZeile() override;
+        DLLEXPORT Text* readLine() override;
         //! Checks whether the resource has been fully read
         //!  return 1 if the resource has been fully read. 0 otherwise
-        DLLEXPORT bool istEnde() const override;
+        DLLEXPORT bool isEnd() const override;
         //! Sets the position of the byte to be read next
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the resource. 0 if

InitFile.cpp

@@ -52,36 +52,36 @@ void InitFile::setPfad(const char* pfad)
     this->pfad->setText(pfad);
 }
 
-bool InitFile::laden()
+bool InitFile::load()
 {
     File* dat = new File();
     dat->setFile(pfad->getText());
-    if (!dat->open(File::Style::lesen))
+    if (!dat->open(File::Style::readAll))
     {
         dat->release();
         return 0;
     }
     removeAlle();
-    Text* zeile = dat->leseZeile();
+    Text* zeile = dat->readLine();
     while (zeile)
     {
         zeile->remove("\r\n");
         zeile->remove("\n");
-        Text* n = zeile->getTeilText(0, zeile->positionVon('='));
-        Text* w = zeile->getTeilText(zeile->positionVon('=') + 1);
+        Text* n = zeile->getTeilText(0, zeile->positionOf('='));
+        Text* w = zeile->getTeilText(zeile->positionOf('=') + 1);
         name->add(n);
         wert->add(w);
         zeile->release();
-        zeile = dat->leseZeile();
+        zeile = dat->readLine();
     }
     dat->close();
     dat->release();
     return 1;
 }
 
-bool InitFile::addWert(Text* name, Text* wert)
+bool InitFile::addValue(Text* name, Text* wert)
 {
-    if (!wertExistiert(name->getText()))
+    if (!valueExists(name->getText()))
     {
         this->name->add(new Text(name->getText()));
         this->wert->add(new Text(wert->getText()));
@@ -94,14 +94,14 @@ bool InitFile::addWert(Text* name, Text* wert)
     return 0;
 }
 
-bool InitFile::addWert(const char* name, const char* wert)
+bool InitFile::addValue(const char* name, const char* wert)
 {
-    return addWert(new Text(name), new Text(wert));
+    return addValue(new Text(name), new Text(wert));
 }
 
-bool InitFile::setWert(Text* name, Text* wert)
+bool InitFile::setValue(Text* name, Text* wert)
 {
-    if (!wertExistiert(name->getText()))
+    if (!valueExists(name->getText()))
     {
         name->release();
         wert->release();
@@ -110,7 +110,7 @@ bool InitFile::setWert(Text* name, Text* wert)
     auto n = this->name->begin();
     for (auto v = this->wert->begin(); v; v++, n++)
     {
-        if (n->istGleich(name->getText()))
+        if (n->isEqual(name->getText()))
         {
             v->setText(wert->getText());
             name->release();
@@ -123,38 +123,38 @@ bool InitFile::setWert(Text* name, Text* wert)
     return 0;
 }
 
-bool InitFile::setWert(const char* name, const char* wert)
+bool InitFile::setValue(const char* name, const char* wert)
 {
-    return setWert(new Text(name), new Text(wert));
+    return setValue(new Text(name), new Text(wert));
 }
 
-bool InitFile::setWert(int num, Text* wert)
+bool InitFile::setValue(int num, Text* wert)
 {
-    bool result = setWert(num, wert->getText());
+    bool result = setValue(num, wert->getText());
     wert->release();
     return result;
 }
 
-bool InitFile::setWert(int num, const char* wert)
+bool InitFile::setValue(int num, const char* wert)
 {
     if (num >= name->getEntryCount()) return 0;
     this->wert->z(num)->setText(wert);
     return 1;
 }
 
-bool InitFile::removeWert(Text* name)
+bool InitFile::removeValue(Text* name)
 {
-    bool result = removeWert(name->getText());
+    bool result = removeValue(name->getText());
     name->release();
     return result;
 }
 
-bool InitFile::removeWert(const char* name)
+bool InitFile::removeValue(const char* name)
 {
-    if (!wertExistiert(name)) return 0;
+    if (!valueExists(name)) return 0;
     for (int i = 0; i < wert->getEntryCount(); ++i)
     {
-        if (this->name->z(i)->istGleich(name))
+        if (this->name->z(i)->isEqual(name))
         {
             this->name->remove(i);
             this->wert->remove(i);
@@ -164,7 +164,7 @@ bool InitFile::removeWert(const char* name)
     return 0;
 }
 
-bool InitFile::removeWert(int num)
+bool InitFile::removeValue(int num)
 {
     if (num >= wert->getEntryCount()) return 0;
     this->name->remove(num);
@@ -181,11 +181,11 @@ void InitFile::removeAlle()
     }
 }
 
-bool InitFile::speichern()
+bool InitFile::save()
 {
     File* dat = new File();
     dat->setFile(pfad->getText());
-    if (!dat->existiert()) dat->erstellen();
+    if (!dat->exists()) dat->create();
     if (!dat->open(File::Style::schreiben))
     {
         dat->release();
@@ -199,7 +199,7 @@ bool InitFile::speichern()
         zeile->append("=");
         zeile->append(v->getText());
         zeile->append("\n");
-        dat->schreibe(zeile->getText(), zeile->getLength());
+        dat->write(zeile->getText(), zeile->getLength());
         zeile->release();
     }
     dat->close();
@@ -208,85 +208,85 @@ bool InitFile::speichern()
 }
 
 // constant
-int InitFile::getWertAnzahl() const
+int InitFile::getValueCount() const
 {
     return name->getEntryCount();
 }
 
-bool InitFile::wertExistiert(Text* name)
+bool InitFile::valueExists(Text* name)
 {
-    bool result = wertExistiert(name->getText());
+    bool result = valueExists(name->getText());
     name->release();
     return result;
 }
 
-bool InitFile::wertExistiert(const char* name)
+bool InitFile::valueExists(const char* name)
 {
     for (Text* n : *this->name)
     {
-        if (n->istGleich(name)) return 1;
+        if (n->isEqual(name)) return 1;
     }
     return 0;
 }
 
-int InitFile::getWertNummer(Text* name)
+int InitFile::getValueNumber(Text* name)
 {
-    int result = getWertNummer(name->getText());
+    int result = getValueNumber(name->getText());
     name->release();
     return result;
 }
 
-int InitFile::getWertNummer(const char* name)
+int InitFile::getValueNumber(const char* name)
 {
     int i = 0;
     for (Text* n : *this->name)
     {
-        if (n->istGleich(name)) return i;
+        if (n->isEqual(name)) return i;
     }
     return -1;
 }
 
-Text* InitFile::getWert(Text* name)
+Text* InitFile::getValue(Text* name)
 {
-    Text* result = getWert(name->getText());
+    Text* result = getValue(name->getText());
     name->release();
     return result;
 }
 
-Text* InitFile::getWert(const char* name)
+Text* InitFile::getValue(const char* name)
 {
     auto v = wert->begin();
     for (auto n = this->name->begin(); n; n++, v++)
     {
-        if (n->istGleich(name)) return dynamic_cast<Text*>(v->getThis());
+        if (n->isEqual(name)) return dynamic_cast<Text*>(v->getThis());
     }
     return 0;
 }
 
-Text* InitFile::getWert(int num)
+Text* InitFile::getValue(int num)
 {
     if (num >= name->getEntryCount()) return 0;
     return wert->get(num);
 }
 
-Text* InitFile::zWert(Text* name)
+Text* InitFile::zValue(Text* name)
 {
-    Text* result = zWert(name->getText());
+    Text* result = zValue(name->getText());
     name->release();
     return result;
 }
 
-Text* InitFile::zWert(const char* name)
+Text* InitFile::zValue(const char* name)
 {
     auto v = wert->begin();
     for (auto n = this->name->begin(); n; n++, v++)
     {
-        if (n->istGleich(name)) return v;
+        if (n->isEqual(name)) return v;
     }
     return 0;
 }
 
-Text* InitFile::zWert(int num)
+Text* InitFile::zValue(int num)
 {
     if (num >= wert->getEntryCount()) return 0;
     return wert->z(num);

InitFile.h

@@ -35,99 +35,99 @@ namespace Framework
         DLLEXPORT void setPfad(const char* pfad);
         //! Loads the values from the file
         //! \return 1 if loading was successful. 0 if an error occurred.
-        DLLEXPORT bool laden();
+        DLLEXPORT bool load();
         //! Adds a value to the file
         //! \param name The name of the value
         //! \param wert The value to store
         //! \return 1 if the value was successfully added
-        DLLEXPORT bool addWert(Text* name, Text* wert);
+        DLLEXPORT bool addValue(Text* name, Text* wert);
         //! Adds a value to the file
         //! \param name The name of the value
         //! \param wert The value to store
         //! \return 1 if the value was successfully added
-        DLLEXPORT bool addWert(const char* name, const char* wert);
+        DLLEXPORT bool addValue(const char* name, const char* wert);
         //! Changes a specific value
         //! \param name The name of the value
         //! \param wert The value to store
         //! \return 1 if the value existed and was successfully changed
-        DLLEXPORT bool setWert(Text* name, Text* wert);
+        DLLEXPORT bool setValue(Text* name, Text* wert);
         //! Changes a specific value
         //! \param name The name of the value
         //! \param wert The value to store
         //! \return 1 if the value existed and was successfully changed
-        DLLEXPORT bool setWert(const char* name, const char* wert);
+        DLLEXPORT bool setValue(const char* name, const char* wert);
         //! Changes a specific value
         //! \param num The index of the value to change
         //! \param wert The value to store
         //! \return 1 if the value existed and was successfully changed
-        DLLEXPORT bool setWert(int num, Text* wert);
+        DLLEXPORT bool setValue(int num, Text* wert);
         //! Changes a specific value
         //! \param num The index of the value to change
         //! \param wert The value to store
         //! \return 1 if the value existed and was successfully changed
-        DLLEXPORT bool setWert(int num, const char* wert);
+        DLLEXPORT bool setValue(int num, const char* wert);
         //! Deletes a specific value
         //! \param name The name of the value to delete
         //! \return 1 if the value existed and was successfully deleted
-        DLLEXPORT bool removeWert(Text* name);
+        DLLEXPORT bool removeValue(Text* name);
         //! Deletes a specific value
         //! \param name The name of the value to delete
         //! \return 1 if the value existed and was successfully deleted
-        DLLEXPORT bool removeWert(const char* name);
+        DLLEXPORT bool removeValue(const char* name);
         //! Deletes a specific value
         //! \param num The index of the value to delete
         //! \return 1 if the value existed and was successfully deleted
-        DLLEXPORT bool removeWert(int num);
+        DLLEXPORT bool removeValue(int num);
         //! Deletes all values from the file
         DLLEXPORT void removeAlle();
         //! Saves all values to the file
         //! \return 1 if saving was successful
-        DLLEXPORT bool speichern();
+        DLLEXPORT bool save();
         //! Returns the number of stored values
-        DLLEXPORT int getWertAnzahl() const;
+        DLLEXPORT int getValueCount() const;
         //! Checks whether a specific value exists
         //! \param name The name to search for
         //! \return 1 if the value was found
-        DLLEXPORT bool wertExistiert(Text* name);
+        DLLEXPORT bool valueExists(Text* name);
         //! Checks whether a specific value exists
         //! \param name The name to search for
         //! \return 1 if the value was found
-        DLLEXPORT bool wertExistiert(const char* name);
+        DLLEXPORT bool valueExists(const char* name);
         //! Returns the index of a specific value
         //! \param name The name of the value to search for
         //! \return -1 if the value was not found. The index of the value.
-        DLLEXPORT int getWertNummer(Text* name);
+        DLLEXPORT int getValueNumber(Text* name);
         //! Returns the index of a specific value
         //! \param name The name of the value to search for
         //! \return -1 if the value was not found. The index of the value.
-        DLLEXPORT int getWertNummer(const char* name);
+        DLLEXPORT int getValueNumber(const char* name);
         //! Returns a specific value
         //! \param name The name of the value to return
         //! \return 0 if the value was not found.
-        DLLEXPORT Text* getWert(Text* name);
+        DLLEXPORT Text* getValue(Text* name);
         //! Returns a specific value
         //! \param name The name of the value to return
         //! \return 0 if the value was not found.
-        DLLEXPORT Text* getWert(const char* name);
+        DLLEXPORT Text* getValue(const char* name);
         //! Returns a specific value
         //! \param num The index of the value to return
         //! \return 0 if the value was not found.
-        DLLEXPORT Text* getWert(int num);
+        DLLEXPORT Text* getValue(int num);
         //! Returns a specific value
         //! \param name The name of the value to return
         //! \return 0 if the value was not found. The value without
         //! increased reference counter
-        DLLEXPORT Text* zWert(Text* name);
+        DLLEXPORT Text* zValue(Text* name);
         //! Returns a specific value
         //! \param name The name of the value to return
         //! \return 0 if the value was not found. The value without
         //! increased reference counter
-        DLLEXPORT Text* zWert(const char* name);
+        DLLEXPORT Text* zValue(const char* name);
         //! Returns a specific value
         //! \param num The index of the value to return
         //! \return 0 if the value was not found. The value without
         //! increased reference counter
-        DLLEXPORT Text* zWert(int num);
+        DLLEXPORT Text* zValue(int num);
         //! Returns the name of a specific value
         //! \param num The index of the value whose name should be returned
         //! \return 0 if the value was not found.

JSON.cpp

@@ -147,8 +147,8 @@ JSONString::JSONString(Text string)
     : JSONValue(AbstractType::STRING)
 {
     this->string = string;
-    this->string.ersetzen("\\\"", "\"");
-    this->string.ersetzen("\\n", "\n");
+    this->string.replace("\\\"", "\"");
+    this->string.replace("\\n", "\n");
 }
 
 Text JSONString::getString() const
@@ -159,16 +159,16 @@ Text JSONString::getString() const
 Text JSONString::toString() const
 {
     Text esc = string;
-    esc.ersetzen("\"", "\\\"");
-    esc.ersetzen("\n", "\\n");
+    esc.replace("\"", "\\\"");
+    esc.replace("\n", "\\n");
     return Text(Text("\"") += esc.getText()) += "\"";
 }
 
 JSONValue* JSONString::clone() const
 {
     Text esc = string;
-    esc.ersetzen("\"", "\\\"");
-    esc.ersetzen("\n", "\\n");
+    esc.replace("\"", "\\\"");
+    esc.replace("\n", "\\n");
     return new JSONString(esc);
 }
 
@@ -369,7 +369,7 @@ bool JSONObject::removeValue(Text field)
 {
     for (int i = 0; i < fields->getEntryCount(); i++)
     {
-        if (fields->get(i).istGleich(field))
+        if (fields->get(i).isEqual(field))
         {
             fields->remove(i);
             values->remove(i);
@@ -388,7 +388,7 @@ JSONValue* JSONObject::getValue(Text field) const
 {
     for (int i = 0; i < fields->getEntryCount(); i++)
     {
-        if (fields->get(i).istGleich(field)) return values->get(i);
+        if (fields->get(i).isEqual(field)) return values->get(i);
     }
     return 0;
 }
@@ -397,7 +397,7 @@ JSONValue* JSONObject::zValue(Text field) const
 {
     for (int i = 0; i < fields->getEntryCount(); i++)
     {
-        if (fields->get(i).istGleich(field)) return values->z(i);
+        if (fields->get(i).isEqual(field)) return values->z(i);
     }
     return 0;
 }
@@ -436,7 +436,7 @@ bool JSONObject::isValueOfType(Text field, AbstractType type) const
 {
     for (int i = 0; i < fields->getEntryCount(); i++)
     {
-        if (fields->get(i).istGleich(field))
+        if (fields->get(i).isEqual(field))
             return values->z(i)->getType() == type;
     }
     return 0;
@@ -476,14 +476,14 @@ JSONValue* JSON::loadJSONFromFile(Text path)
 {
     File d;
     d.setFile(path);
-    if (!d.open(File::Style::lesen))
+    if (!d.open(File::Style::readAll))
     {
         return new JSONValue();
     }
     int size = (int)d.getSize();
     char* buffer = new char[size + 1];
     buffer[size] = 0;
-    d.lese(buffer, size);
+    d.read(buffer, size);
     d.close();
     JSONValue* result = Parser::getValue(buffer);
     delete[] buffer;
@@ -573,8 +573,8 @@ Text Parser::removeWhitespace(const char* str)
 JSONValue* Parser::getValue(const char* str)
 {
     Text string = Parser::removeWhitespace(str);
-    if (string.istGleich("true")) return new JSONBool(1);
-    if (string.istGleich("false")) return new JSONBool(0);
+    if (string.isEqual("true")) return new JSONBool(1);
+    if (string.isEqual("false")) return new JSONBool(0);
     if (string.getText()[0] == '"')
     {
         string.remove(0, 1);
@@ -583,9 +583,9 @@ JSONValue* Parser::getValue(const char* str)
     }
     if (string.getText()[0] == '[') return new JSONArray(string);
     if (string.getText()[0] == '{') return new JSONObject(string);
-    if (Text((int)string).istGleich(string.getText()))
+    if (Text((int)string).isEqual(string.getText()))
         return new JSONNumber((double)string);
-    if (string.anzahlVon('.') == 1)
+    if (string.countOf('.') == 1)
     {
         bool isNumber = 1;
         for (const char* c = (*string.getText() == '-') ? string.getText() + 1

JsonEditor.cpp

@@ -53,7 +53,7 @@ public:
 
     AbstractType getType() const override
     {
-        if (root->hasError() || root->getValue().istGleich("null"))
+        if (root->hasError() || root->getValue().isEqual("null"))
         {
             return AbstractType::NULL_;
         }
@@ -65,12 +65,12 @@ public:
         {
             return AbstractType::ARRAY;
         }
-        else if (root->getValue().istGleich("true")
-                 || root->getValue().istGleich("false"))
+        else if (root->getValue().isEqual("true")
+                 || root->getValue().isEqual("false"))
         {
             return AbstractType::BOOLEAN;
         }
-        else if (root->getValue().hatAt(0, "\""))
+        else if (root->getValue().hasAt(0, "\""))
         {
             return AbstractType::STRING;
         }
@@ -162,7 +162,7 @@ public:
         EditableJsonElement* e = root->zFirstChildren();
         while (e)
         {
-            if (e->getKey().istGleich(field))
+            if (e->getKey().isEqual(field))
             {
                 EditableJsonElementReference* result
                     = new EditableJsonElementReference(e, children);
@@ -199,7 +199,7 @@ public:
         EditableJsonElement* e = root->zFirstChildren();
         while (e)
         {
-            if (e->getKey().istGleich(field))
+            if (e->getKey().isEqual(field))
             {
                 return 1;
             }
@@ -513,7 +513,7 @@ void Framework::JSON::EditableJsonElement::setContentOnly(const char** content,
     Array<EditableJsonElement*>& afterList,
     Array<EditableJsonElement*>& deleteList)
 {
-    errors.leeren();
+    errors.clear();
     int start = startPos;
     EditableJsonElement* before = zBefore(0, false, 0);
     ParserState p(parentStructure,
@@ -624,7 +624,7 @@ void Framework::JSON::EditableJsonElement::setContentOnly(const char** content,
     this->content += Text(*content,
         start < 0 ? 0 : start,
         start < 0 ? startPos : startPos - start);
-    newLineCount = this->content.anzahlVon('\n');
+    newLineCount = this->content.countOf('\n');
     openingControllChar = p.openingControllChar;
     closingControllChar = p.closingControllChar;
     valueStart = p.valueStart;
@@ -804,8 +804,8 @@ bool Framework::JSON::EditableJsonElement::isValueValid(
     const char* content, int start, int end)
 {
     Text value(content, start, end - start);
-    if (value.istGleich("null") || value.istGleich("true")
-        || value.istGleich("false"))
+    if (value.isEqual("null") || value.isEqual("true")
+        || value.isEqual("false"))
     {
         return true;
     }
@@ -979,7 +979,7 @@ void Framework::JSON::EditableJsonElement::setContent(
 
 void Framework::JSON::EditableJsonElement::checkSyntax()
 {
-    errors.leeren();
+    errors.clear();
     EditableJsonElement* before = zBefore(0, false, 0);
     ParserState p(parentStructure,
         before
@@ -1426,11 +1426,11 @@ int Framework::JSON::EditableJsonElement::getColor(int index)
         {
             color = 0xFF70C070;
         }
-        else if (value.istGleich("null"))
+        else if (value.isEqual("null"))
         {
             color = 0xFFC0A070;
         }
-        else if (value.istGleich("true") || value.istGleich("false"))
+        else if (value.isEqual("true") || value.isEqual("false"))
         {
             color = 0xFFC070C0;
         }
@@ -1680,9 +1680,9 @@ JsonEditor::JsonEditor(UIInit uiInit)
     renderStartOffset = 0;
     selectionEnd = {0, 0};
     textRenderer = new TextRenderer();
-    textRenderer->setSchriftSize(12);
-    textRenderer->setZeilenAbstand(2);
-    textRenderer->setZeichenAbstand(1);
+    textRenderer->setFontSize(12);
+    textRenderer->setLineSpacing(2);
+    textRenderer->setCharSpacing(1);
     pressed = 0;
     time = 0;
     drag = 0;
@@ -1699,12 +1699,12 @@ JsonEditor::JsonEditor(UIInit uiInit)
     errorDescription = uiInit.createTextField(uiInit.initParam);
     errorDescription->setStyle(TextField::Style::Text | TextField::Style::Center
                                | TextField::Style::Border
-                               | TextField::Style::Hintergrund
+                               | TextField::Style::Background
                                | TextField::Style::HAlpha);
-    errorDescription->removeStyle(TextField::Style::Sichtbar);
-    errorDescription->setSchriftFarbe(0xFFFFFFFF);
+    errorDescription->removeStyle(TextField::Style::Visible);
+    errorDescription->setFontColor(0xFFFFFFFF);
     errorDescription->setBorderColor(0xFFA0A0A0);
-    errorDescription->setHintergrundFarbe(0xA0000000);
+    errorDescription->setBackgroundColor(0xA0000000);
     hasSyntaxError = false;
 }
 
@@ -1722,7 +1722,7 @@ void Framework::JSON::JsonEditor::doMouseEvent(MouseEvent& me, bool userRet)
     rend |= cursorPos.x != me.mx || cursorPos.y != me.my;
     cursorPos.x = me.mx;
     cursorPos.y = me.my;
-    if (me.id == ME_RLinks)
+    if (me.id == ME_RLeft)
     {
         pressedPos = cursorPos;
         if (timeSicePress < 0.5)
@@ -1748,9 +1748,9 @@ void Framework::JSON::JsonEditor::doMouseEvent(MouseEvent& me, bool userRet)
         time = 0;
         timeSicePress = 0.0;
     }
-    if (me.id == ME_PLinks || (me.id == ME_Betritt && getMausStand(M_Links)))
+    if (me.id == ME_PLeft || (me.id == ME_Enter && getMouseState(M_Left)))
     {
-        if (me.mx >= getInnenBreite() - 15)
+        if (me.mx >= getInnerWidth() - 15)
         {
             int line = (int)(me.my / ((double)getInnenHeight() / lineCount));
             if (line >= lineCount)
@@ -1771,11 +1771,11 @@ void Framework::JSON::JsonEditor::doMouseEvent(MouseEvent& me, bool userRet)
             time = 0;
         }
     }
-    if (me.id == ME_Bewegung)
+    if (me.id == ME_Move)
     {
         if (drag)
         {
-            if (dragSart.x >= getInnenBreite() - 15)
+            if (dragSart.x >= getInnerWidth() - 15)
             {
                 int line
                     = (int)(me.my / ((double)getInnenHeight() / lineCount));
@@ -1928,7 +1928,7 @@ EditorPosition Framework::JSON::JsonEditor::getScreenPosition(
         lineNumberWidth++;
     }
     lineNumberWidth = lineNumberWidth * textRenderer->getMaxCharWidth()
-                    + textRenderer->getZeichenAbstand() * (lineNumberWidth - 1);
+                    + textRenderer->getCharSpacing() * (lineNumberWidth - 1);
     int x = lineNumberWidth + 26;
     EditableJsonElement* current = renderStart.line;
     int index = renderStart.column;
@@ -1939,10 +1939,10 @@ EditorPosition Framework::JSON::JsonEditor::getScreenPosition(
         const char* content = current->getContent();
         for (int i = index; i < length; i++)
         {
-            if (y >= localY - textRenderer->getZeilenHeight()
-                         - textRenderer->getZeilenAbstand()
+            if (y >= localY - textRenderer->getRowHeight()
+                         - textRenderer->getLineSpacing()
                 && x >= localX - textRenderer->getCharWidth(content[i]) / 2
-                            - textRenderer->getZeichenAbstand())
+                            - textRenderer->getCharSpacing())
             {
                 EditorPosition result = {current, i};
                 unifyPosition(result);
@@ -1950,21 +1950,21 @@ EditorPosition Framework::JSON::JsonEditor::getScreenPosition(
             }
             if (content[i] == '\n')
             {
-                if (y >= localY - textRenderer->getZeilenHeight()
-                             - textRenderer->getZeilenAbstand())
+                if (y >= localY - textRenderer->getRowHeight()
+                             - textRenderer->getLineSpacing())
                 {
                     EditorPosition result = {current, i};
                     unifyPosition(result);
                     return result;
                 }
-                y += textRenderer->getZeilenHeight()
-                   + textRenderer->getZeilenAbstand();
+                y += textRenderer->getRowHeight()
+                   + textRenderer->getLineSpacing();
                 x = lineNumberWidth + 26;
             }
             else
             {
                 x += textRenderer->getCharWidth(content[i])
-                   + textRenderer->getZeichenAbstand();
+                   + textRenderer->getCharSpacing();
             }
         }
         last = current;
@@ -2056,16 +2056,16 @@ void Framework::JSON::JsonEditor::fixTree(EditableJsonElement* zElement)
     }
 }
 
-void Framework::JSON::JsonEditor::setFont(Font* schrift)
+void Framework::JSON::JsonEditor::setFont(Font* font)
 {
-    textRenderer->setFontZ(schrift);
+    textRenderer->setFontZ(font);
 }
 
 void Framework::JSON::JsonEditor::setFontSize(int size)
 {
-    textRenderer->setSchriftSize(size);
-    textRenderer->setZeilenAbstand(size / 6);
-    textRenderer->setZeichenAbstand(size / 8);
+    textRenderer->setFontSize(size);
+    textRenderer->setLineSpacing(size / 6);
+    textRenderer->setCharSpacing(size / 8);
 }
 
 void JsonEditor::setContent(Text content)
@@ -2078,8 +2078,8 @@ void JsonEditor::setContent(Text content)
     }
     this->content = new EditableJsonElement(
         dynamic_cast<Regex::Automata<char>*>(valueValidator->getThis()));
-    content.ersetzen("\r", "");
-    content.ersetzen("\t", "    ");
+    content.replace("\r", "");
+    content.replace("\t", "    ");
     this->content->setContent(content);
     textCursor = {this->content, 0};
     selectionStart = {this->content, 0};
@@ -2118,8 +2118,8 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
     {
         return;
     }
-    bool shift = getTastenStand(T_Shift);
-    bool strg = getTastenStand(T_Strg);
+    bool shift = getKeyState(T_Shift);
+    bool strg = getKeyState(T_Strg);
     if (te.id == TE_Press)
     {
         switch (te.virtualKey)
@@ -2152,7 +2152,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                         int end = 0;
                         nextLine->getWordBounds(nextColumn, &start, &end);
                         if ((start != end
-                                && !illegalStarts.hat(
+                                && !illegalStarts.has(
                                     nextLine->getContent()[start]))
                             || (lastStr
                                 && nextLine->getContent()[nextColumn] == '"'))
@@ -2172,7 +2172,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                                 unifyPosition(selectionEnd);
                                 textCursor = selectionEnd;
                                 scrollToLine(textCursor, Top);
-                                te.verarbeitet = true;
+                                te.processed = true;
                                 time = 0;
                                 rend = 1;
                                 return;
@@ -2207,7 +2207,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                         int end = 0;
                         nextLine->getWordBounds(nextColumn, &start, &end);
                         if (((start != end
-                                 && !illegalStarts.hat(
+                                 && !illegalStarts.has(
                                      nextLine->getContent()[start]))
                                 || (lastStr
                                     && nextLine->getContent()[nextColumn]
@@ -2222,7 +2222,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                             unifyPosition(selectionEnd);
                             textCursor = selectionEnd;
                             scrollToLine(textCursor, Bottom);
-                            te.verarbeitet = true;
+                            te.processed = true;
                             time = 0;
                             rend = 1;
                             return;
@@ -2339,7 +2339,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                     selectionEnd = textCursor;
                 }
                 scrollToLine(textCursor, Top);
-                te.verarbeitet = true;
+                te.processed = true;
                 time = 0;
                 rend = 1;
                 return;
@@ -2437,7 +2437,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                     selectionEnd = textCursor;
                 }
                 scrollToLine(textCursor, Top);
-                te.verarbeitet = true;
+                te.processed = true;
                 time = 0;
                 rend = 1;
                 return;
@@ -2485,7 +2485,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                     selectionEnd = textCursor;
                 }
                 scrollToLine(textCursor, Bottom);
-                te.verarbeitet = true;
+                te.processed = true;
                 time = 0;
                 rend = 1;
                 return;
@@ -2573,7 +2573,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                     selectionEnd = textCursor;
                 }
                 scrollToLine(textCursor, Bottom);
-                te.verarbeitet = true;
+                te.processed = true;
                 time = 0;
                 rend = 1;
                 return;
@@ -2622,7 +2622,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                     }
                     selectionEnd = {element, element->getContent().getLength()};
                     textCursor = selectionEnd;
-                    te.verarbeitet = true;
+                    te.processed = true;
                     time = 0;
                     rend = 1;
                     scrollToLine(textCursor, Bottom);
@@ -2634,12 +2634,12 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
                     return;
                 }
             }
-            if (istSchreibbar(te.taste[0]))
+            if (isWritable(te.key[0]))
             {
                 deleteSelection();
                 Text content = textCursor.line->getContent();
-                content.insert(textCursor.column, te.taste);
-                textCursor.column += textLength(te.taste);
+                content.insert(textCursor.column, te.key);
+                textCursor.column += textLength(te.key);
                 textCursor.line->setContent(content);
                 fixTree(textCursor.line);
             }
@@ -2650,7 +2650,7 @@ void Framework::JSON::JsonEditor::doKeyboardEvent(KeyboardEvent& te)
         }
         selectionStart = textCursor;
         selectionEnd = textCursor;
-        te.verarbeitet = true;
+        te.processed = true;
         lineCount = 0;
         content->lineCount(true, true, 0, lineCount);
     }
@@ -2680,12 +2680,12 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
     LOCK(&cs);
     renderings++;
     renderedLines = 0;
-    errorDescription->removeStyle(TextField::Style::Sichtbar);
+    errorDescription->removeStyle(TextField::Style::Visible);
     DrawableBackground::render(rObj);
     if (textRenderer->zFont() && content
         && rObj.setDrawOptions(
-            pos + Punkt(getBorderWidth(), getBorderWidth()),
-            Punkt(getInnenBreite(), getInnenHeight())))
+            pos + Point(getBorderWidth(), getBorderWidth()),
+            Point(getInnerWidth(), getInnenHeight())))
     {
         if (!renderStart.line)
         {
@@ -2700,7 +2700,7 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
         }
         lineNumberWidth
             = lineNumberWidth * textRenderer->getMaxCharWidth()
-            + textRenderer->getZeichenAbstand() * (lineNumberWidth - 1);
+            + textRenderer->getCharSpacing() * (lineNumberWidth - 1);
         bool selected = false;
         EditableJsonElement* element = content;
         while (element)
@@ -2747,7 +2747,7 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
         int index = renderStart.column;
         bool treeBranchRendered = false;
         bool highlighted = false;
-        int numberWidth = textRenderer->getTextBreite(Text(line));
+        int numberWidth = textRenderer->getTextWidth(Text(line));
         textRenderer->renderText(
             5 + lineNumberWidth - numberWidth, y, Text(line), rObj, 0xFF707070);
         bool whiteSpaceOnly = true;
@@ -2772,8 +2772,8 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                 if (textCursor.line == current && textCursor.column == i
                     && drawCursor)
                 {
-                    rObj.drawLinieV(
-                        cursorX, y, textRenderer->getSchriftSize(), 0xFFC0C0C0);
+                    rObj.drawLineV(
+                        cursorX, y, textRenderer->getFontSize(), 0xFFC0C0C0);
                 }
                 if (content[i] == '\n')
                 {
@@ -2782,22 +2782,22 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                     if (!treeBranchRendered)
                     {
                         // | in tree view
-                        rObj.drawLinieV(lineNumberWidth + 13,
+                        rObj.drawLineV(lineNumberWidth + 13,
                             y
-                                - (line > 1 ? textRenderer->getSchriftSize() / 6
+                                - (line > 1 ? textRenderer->getFontSize() / 6
                                             : 0),
-                            textRenderer->getSchriftSize()
-                                + (line > 1 ? textRenderer->getSchriftSize() / 6
+                            textRenderer->getFontSize()
+                                + (line > 1 ? textRenderer->getFontSize() / 6
                                             : 0),
                             0xFF808080);
                         if (highlightStop)
                         {
                             // hover effect in tree view
                             rObj.fillRegion(lineNumberWidth + 10,
-                                y - textRenderer->getSchriftSize() / 6,
+                                y - textRenderer->getFontSize() / 6,
                                 7,
-                                textRenderer->getSchriftSize()
-                                    + textRenderer->getSchriftSize() / 6,
+                                textRenderer->getFontSize()
+                                    + textRenderer->getFontSize() / 6,
                                 0xFF505050);
                         }
                     }
@@ -2805,19 +2805,19 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                     {
                         rObj.fillRegion(x,
                             y,
-                            textRenderer->getTextBreite(" "),
-                            textRenderer->getZeilenHeight()
-                                + textRenderer->getZeilenAbstand(),
+                            textRenderer->getTextWidth(" "),
+                            textRenderer->getRowHeight()
+                                + textRenderer->getLineSpacing(),
                             0xFF502020);
                     }
                     x = lineNumberWidth + 26;
-                    y += textRenderer->getZeilenHeight()
-                       + textRenderer->getZeilenAbstand();
+                    y += textRenderer->getRowHeight()
+                       + textRenderer->getLineSpacing();
                     whiteSpaceOnly = true;
                     line++;
                     renderedLines++;
                     treeBranchRendered = false;
-                    int numberWidth = textRenderer->getTextBreite(Text(line));
+                    int numberWidth = textRenderer->getTextWidth(Text(line));
                     textRenderer->renderText(5 + lineNumberWidth - numberWidth,
                         y,
                         Text(line),
@@ -2837,7 +2837,7 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                 }
                 if (cursorPos.x > cursorX && cursorPos.x <= x
                     && cursorPos.y >= y
-                    && cursorPos.y <= y + textRenderer->getZeilenHeight())
+                    && cursorPos.y <= y + textRenderer->getRowHeight())
                 {
                     if (current->hasError(i))
                     {
@@ -2849,11 +2849,11 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                         errorDescription->setPosition(
                             cursorPos.x, cursorPos.y + 20);
                         if (errorDescription->getX()
-                                + errorDescription->getBreite()
-                            > getInnenBreite())
+                                + errorDescription->getWidth()
+                            > getInnerWidth())
                         {
                             errorDescription->setX(
-                                getInnenBreite() - errorDescription->getBreite()
+                                getInnerWidth() - errorDescription->getWidth()
                                 - 5);
                         }
                         if (errorDescription->getY()
@@ -2864,15 +2864,15 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                                 getInnenHeight() - errorDescription->getHeight()
                                 - 5);
                         }
-                        errorDescription->addStyle(TextField::Style::Sichtbar);
+                        errorDescription->addStyle(TextField::Style::Visible);
                     }
                 }
                 if (column % 4 == 0 && content[i] == ' ' && whiteSpaceOnly)
                 {
-                    rObj.drawLinieV(
-                        cursorX + 1 + textRenderer->getTextBreite(" ") / 2,
+                    rObj.drawLineV(
+                        cursorX + 1 + textRenderer->getTextWidth(" ") / 2,
                         y + 2,
-                        textRenderer->getSchriftSize() - 4,
+                        textRenderer->getFontSize() - 4,
                         0xFF353535);
                 }
                 whiteSpaceOnly &= content[i] == ' ' || content[i] == '\n';
@@ -2890,25 +2890,25 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
             if (textCursor.line == current
                 && textCursor.column == content.getLength() && drawCursor)
             {
-                rObj.drawLinieV(
-                    x - 1, y, textRenderer->getSchriftSize(), 0xFFC0C0C0);
+                rObj.drawLineV(
+                    x - 1, y, textRenderer->getFontSize(), 0xFFC0C0C0);
             }
             if (current->zFirstChildren())
             {
                 if (pressed && pressedPos.x >= lineNumberWidth + 10
                     && pressedPos.x <= lineNumberWidth + 16
                     && pressedPos.y
-                           >= y + textRenderer->getSchriftSize() / 2 - 4
+                           >= y + textRenderer->getFontSize() / 2 - 4
                     && pressedPos.y
-                           <= y + textRenderer->getSchriftSize() / 2 + 2)
+                           <= y + textRenderer->getFontSize() / 2 + 2)
                 {
                     pressed = false;
                     current->setHidden(!current->isHidden());
                 }
                 if (cursorPos.x >= lineNumberWidth + 10
                     && cursorPos.x <= lineNumberWidth + 16
-                    && cursorPos.y >= y + textRenderer->getSchriftSize() / 2 - 4
-                    && cursorPos.y <= y + textRenderer->getSchriftSize() / 2 + 2
+                    && cursorPos.y >= y + textRenderer->getFontSize() / 2 - 4
+                    && cursorPos.y <= y + textRenderer->getFontSize() / 2 + 2
                     && !current->isHidden())
                 {
                     highlightStop = current->zLastChildren();
@@ -2918,21 +2918,21 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                     if (!treeBranchRendered)
                     {
                         rObj.fillRegion(lineNumberWidth + 10,
-                            y + textRenderer->getSchriftSize() / 2 - 4,
+                            y + textRenderer->getFontSize() / 2 - 4,
                             6,
                             6,
                             0xFF000000);
-                        rObj.drawLinie(
-                            Punkt(lineNumberWidth + 10,
-                                y + textRenderer->getSchriftSize() / 2 - 4),
-                            Punkt(lineNumberWidth + 16,
-                                y + textRenderer->getSchriftSize() / 2 - 1),
+                        rObj.drawLine(
+                            Point(lineNumberWidth + 10,
+                                y + textRenderer->getFontSize() / 2 - 4),
+                            Point(lineNumberWidth + 16,
+                                y + textRenderer->getFontSize() / 2 - 1),
                             0xFF808080);
-                        rObj.drawLinie(
-                            Punkt(lineNumberWidth + 10,
-                                y + textRenderer->getSchriftSize() / 2 + 2),
-                            Punkt(lineNumberWidth + 16,
-                                y + textRenderer->getSchriftSize() / 2 - 1),
+                        rObj.drawLine(
+                            Point(lineNumberWidth + 10,
+                                y + textRenderer->getFontSize() / 2 + 2),
+                            Point(lineNumberWidth + 16,
+                                y + textRenderer->getFontSize() / 2 - 1),
                             0xFF808080);
                     }
                     for (char c : " ... ")
@@ -2974,21 +2974,21 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                     if (!treeBranchRendered)
                     {
                         rObj.fillRegion(lineNumberWidth + 10,
-                            y + textRenderer->getSchriftSize() / 2 - 4,
+                            y + textRenderer->getFontSize() / 2 - 4,
                             6,
                             6,
                             0xFF000000);
-                        rObj.drawLinie(
-                            Punkt(lineNumberWidth + 10,
-                                y + textRenderer->getSchriftSize() / 2 - 4),
-                            Punkt(lineNumberWidth + 13,
-                                y + textRenderer->getSchriftSize() / 2 + 2),
+                        rObj.drawLine(
+                            Point(lineNumberWidth + 10,
+                                y + textRenderer->getFontSize() / 2 - 4),
+                            Point(lineNumberWidth + 13,
+                                y + textRenderer->getFontSize() / 2 + 2),
                             0xFF808080);
-                        rObj.drawLinie(
-                            Punkt(lineNumberWidth + 16,
-                                y + textRenderer->getSchriftSize() / 2 - 4),
-                            Punkt(lineNumberWidth + 13,
-                                y + textRenderer->getSchriftSize() / 2 + 2),
+                        rObj.drawLine(
+                            Point(lineNumberWidth + 16,
+                                y + textRenderer->getFontSize() / 2 - 4),
+                            Point(lineNumberWidth + 13,
+                                y + textRenderer->getFontSize() / 2 + 2),
                             0xFF808080);
                     }
                 }
@@ -2997,14 +2997,14 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
             if (!current->zMextSibling() && current->zParent())
             {
                 // |_ in tree view
-                rObj.drawLinieH(lineNumberWidth + 14,
-                    y + textRenderer->getSchriftSize() - 1,
+                rObj.drawLineH(lineNumberWidth + 14,
+                    y + textRenderer->getFontSize() - 1,
                     3,
                     0xFF808080);
             }
-            rObj.drawLinieV(x,
+            rObj.drawLineV(x,
                 y,
-                textRenderer->getSchriftSize(),
+                textRenderer->getFontSize(),
                 0xFF30C030); // TODO: debug tree seperator
             if (current == highlightStop)
             {
@@ -3013,10 +3013,10 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
                 {
                     // hover effect in tree view
                     rObj.fillRegion(lineNumberWidth + 10,
-                        y - textRenderer->getSchriftSize() / 6,
+                        y - textRenderer->getFontSize() / 6,
                         7,
-                        textRenderer->getSchriftSize()
-                            + textRenderer->getSchriftSize() / 6,
+                        textRenderer->getFontSize()
+                            + textRenderer->getFontSize() / 6,
                         0xFF505050);
                     highlighted = true;
                 }
@@ -3027,17 +3027,17 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
         if (!treeBranchRendered && !highlighted)
         {
             // | in tree view
-            rObj.drawLinieV(lineNumberWidth + 13,
-                y - (line > 1 ? textRenderer->getSchriftSize() / 6 : 0),
-                textRenderer->getSchriftSize()
-                    + (line > 1 ? textRenderer->getSchriftSize() / 6 : 0),
+            rObj.drawLineV(lineNumberWidth + 13,
+                y - (line > 1 ? textRenderer->getFontSize() / 6 : 0),
+                textRenderer->getFontSize()
+                    + (line > 1 ? textRenderer->getFontSize() / 6 : 0),
                 0xFF808080);
         }
         EditableJsonElement* resnderStopElement = current;
         renderStopLine = line;
         textRenderer->renderText(5,
-            y + textRenderer->getZeilenHeight()
-                + textRenderer->getZeilenAbstand(),
+            y + textRenderer->getRowHeight()
+                + textRenderer->getLineSpacing(),
             Text("FPS: ") + Text(tps),
             rObj,
             0xFFFFFFFF);
@@ -3076,7 +3076,7 @@ void Framework::JSON::JsonEditor::render(Image& rObj)
             double size = current->lineCount() * yOffset;
             if ((int)(sy + size) > (int)sy || current->hasError())
             {
-                rObj.fillRegion(getInnenBreite() - 15,
+                rObj.fillRegion(getInnerWidth() - 15,
                     (int)sy,
                     15,
                     (int)(sy + MAX(yOffset, 1)),
@@ -3192,14 +3192,14 @@ void Framework::JSON::JsonEditor::scrollToLine(int line, ScrollTargetPos pos)
         int lineCount = element->lineCount();
         if (lineCount + l >= line)
         {
-            column = element->getContent().positionVon('\n', line - l - 1) + 1;
+            column = element->getContent().positionOf('\n', line - l - 1) + 1;
             break;
         }
         l += lineCount;
         EditableJsonElement* tmp = element->zAfter(true, &l);
         if (l >= line)
         {
-            column = element->getContent().positionVon('\n', lineCount - 1) + 1;
+            column = element->getContent().positionOf('\n', lineCount - 1) + 1;
             break;
         }
         element = tmp;
@@ -3220,7 +3220,7 @@ void Framework::JSON::JsonEditor::scrollToLine(
     if (!content->lineCount(true, true, target.line, lineNumber))
     {
         Text* part = target.line->getContent().getTeilText(0, target.column);
-        lineNumber += part->anzahlVon('\n');
+        lineNumber += part->countOf('\n');
         part->release();
         if (pos == Top || pos == Bottom)
         {
@@ -3282,7 +3282,7 @@ void Framework::JSON::JsonEditor::scrollToLine(
             {
                 Text* part
                     = element->getContent().getTeilText(0, target.column);
-                newLines = part->anzahlVon('\n');
+                newLines = part->countOf('\n');
                 part->release();
             }
             else
@@ -3292,7 +3292,7 @@ void Framework::JSON::JsonEditor::scrollToLine(
             if (newLines > linesUntilStart)
             {
                 renderStart = {element,
-                    element->getContent().positionVon(
+                    element->getContent().positionOf(
                         '\n', newLines - linesUntilStart - 1)
                         + 1};
                 unifyPosition(renderStart);

JsonEditor.h

@@ -202,9 +202,9 @@ namespace Framework
             int renderStartLine;
             int renderStopLine;
             int lineCount;
-            Punkt cursorPos;
-            Punkt pressedPos;
-            Punkt dragSart;
+            Point cursorPos;
+            Point pressedPos;
+            Point dragSart;
             double timeSicePress;
             bool pressed;
             double time;
@@ -232,7 +232,7 @@ namespace Framework
             DLLEXPORT void fixTree(EditableJsonElement* zElement);
 
         public:
-            DLLEXPORT void setFont(Font* schrift);
+            DLLEXPORT void setFont(Font* font);
             DLLEXPORT void setFontSize(int size);
             DLLEXPORT void setContent(Text content);
             DLLEXPORT void setContent(JSONValue* content);

KSGTFile.cpp

@@ -48,12 +48,12 @@ void KSGTFile::setPfad(Text* pfad)
     pfad->release();
 }
 
-bool KSGTFile::laden()
+bool KSGTFile::load()
 {
     std::ifstream inf;
     inf.open(pfad->getText(), std::ios::binary);
     if (!inf.good() || !inf.is_open()) return 0;
-    data->leeren();
+    data->clear();
     inf.seekg(0, std::ios::end);
     __int64 gr = inf.tellg();
     __int64 pos = 0;
@@ -96,29 +96,29 @@ bool KSGTFile::laden()
     return 1;
 }
 
-bool KSGTFile::addZeile(int feldAnzahl, RCArray<Text>* zWert)
+bool KSGTFile::addRow(int fieldCount, RCArray<Text>* zValue)
 {
     auto line = new RCArray<Text>();
     data->add(line);
-    for (Text* t : *zWert)
+    for (Text* t : *zValue)
         line->add((Text*)t ? new Text(t->getText()) : 0);
     return 1;
 }
 
-bool KSGTFile::setZeile(int zeile, int feldAnzahl, RCArray<Text>* zWert)
+bool KSGTFile::setRow(int zeile, int fieldCount, RCArray<Text>* zValue)
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA) return 0;
     auto line = new RCArray<Text>();
     data->set(line, zeile);
-    for (Text* t : *zWert)
+    for (Text* t : *zValue)
         line->add(t ? new Text(t->getText()) : 0);
     return 1;
 }
 
-bool KSGTFile::removeZeile(int zeile)
+bool KSGTFile::removeRow(int zeile)
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA) return 0;
     data->remove(zeile);
     return 1;
@@ -126,13 +126,13 @@ bool KSGTFile::removeZeile(int zeile)
 
 bool KSGTFile::addField(int zeile, int pos, Text* wert)
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA)
     {
         wert->release();
         return 0;
     }
-    int fA = getFeldAnzahl(zeile);
+    int fA = getFieldCount(zeile);
     if (pos > fA)
     {
         wert->release();
@@ -150,7 +150,7 @@ bool KSGTFile::addField(int zeile, int pos, const char* wert)
 
 bool KSGTFile::addField(int zeile, Text* wert)
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA)
     {
         wert->release();
@@ -168,13 +168,13 @@ bool KSGTFile::addField(int zeile, const char* wert)
 
 bool KSGTFile::setField(int zeile, int feld, Text* wert)
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA)
     {
         wert->release();
         return 0;
     }
-    int fA = getFeldAnzahl(zeile);
+    int fA = getFieldCount(zeile);
     if (feld >= fA)
     {
         wert->release();
@@ -192,15 +192,15 @@ bool KSGTFile::setField(int zeile, int feld, const char* wert)
 
 bool KSGTFile::removeField(int zeile, int feld)
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA) return 0;
-    int fA = getFeldAnzahl(zeile);
+    int fA = getFieldCount(zeile);
     if (feld >= fA) return 0;
     data->z(zeile)->remove(feld);
     return 1;
 }
 
-bool KSGTFile::speichern()
+bool KSGTFile::save()
 {
     if (!pfad->getLength()) return 0;
     if (!FileExists(pfad->getText())) FilePathCreate(pfad->getText());
@@ -222,32 +222,32 @@ bool KSGTFile::speichern()
 }
 
 // constant
-int KSGTFile::getZeilenAnzahl() const
+int KSGTFile::getRowCount() const
 {
     return data->getEntryCount();
 }
 
-int KSGTFile::getFeldAnzahl(int zeile) const
+int KSGTFile::getFieldCount(int zeile) const
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA) return 0;
     return data->z(zeile)->getEntryCount();
 }
 
 Text* KSGTFile::getField(int zeile, int feld) const
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA) return 0;
-    int fA = getFeldAnzahl(zeile);
+    int fA = getFieldCount(zeile);
     if (feld >= fA) return 0;
     return data->z(zeile)->get(feld);
 }
 
 Text* KSGTFile::zField(int zeile, int feld) const
 {
-    int zA = getZeilenAnzahl();
+    int zA = getRowCount();
     if (zeile >= zA) return 0;
-    int fA = getFeldAnzahl(zeile);
+    int fA = getFieldCount(zeile);
     if (feld >= fA) return 0;
     return data->z(zeile)->z(feld);
 }

KSGTFile.h

@@ -34,24 +34,24 @@ namespace Framework
         //! Loads all data from the specified file
         //! \return 1 if loading was successful. 0 if an error occurred
         //! during loading
-        DLLEXPORT bool laden();
+        DLLEXPORT bool load();
         //! Adds a row to the table
-        //! \param feldAnzahl The number of fields in the row
-        //! \param zWert A pointer to the values in the row without increased
+        //! \param fieldCount The number of fields in the row
+        //! \param zValue A pointer to the values in the row without increased
         //! reference counter \return 1 if no error occurred
-        DLLEXPORT bool addZeile(int feldAnzahl, RCArray<Text>* zWert);
+        DLLEXPORT bool addRow(int fieldCount, RCArray<Text>* zValue);
         //! Replaces an existing row
         //! \param zeile The index of the row to replace
-        //! \param feldAnzahl The number of fields in the row
-        //! \param zWert A pointer to the values in the row without increased
+        //! \param fieldCount The number of fields in the row
+        //! \param zValue A pointer to the values in the row without increased
         //! reference counter \return 1 if the row existed and was replaced.
         //! 0 if the specified row did not exist
-        DLLEXPORT bool setZeile(
-            int zeile, int feldAnzahl, RCArray<Text>* zWert);
+        DLLEXPORT bool setRow(
+            int zeile, int fieldCount, RCArray<Text>* zValue);
         //! Deletes a row
         //! \param zeile The index of the row to delete
         //! \return 1 if the row was deleted. 0 if the row was not found
-        DLLEXPORT bool removeZeile(int zeile);
+        DLLEXPORT bool removeRow(int zeile);
         //! 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
@@ -98,12 +98,12 @@ namespace Framework
         DLLEXPORT bool removeField(int zeile, int feld);
         //! Saves the table to the file
         //! \return 1 if the table was successfully saved
-        DLLEXPORT bool speichern();
+        DLLEXPORT bool save();
         //! Returns the number of rows
-        DLLEXPORT int getZeilenAnzahl() const;
+        DLLEXPORT int getRowCount() const;
         //! Returns the number of values (columns) in a row
         //! \param zeile The index of the row whose value count should be determined
-        DLLEXPORT int getFeldAnzahl(int zeile) const;
+        DLLEXPORT int getFieldCount(int zeile) 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

Key.cpp

@@ -156,7 +156,7 @@ void Key::setKey(const char* s, int len)
     this->length = len;
 }
 
-void Key::codieren(Bytes* daten)
+void Key::encode2(Bytes* daten)
 {
     if (!key || !length)
     {
@@ -175,7 +175,7 @@ void Key::codieren(Bytes* daten)
     daten->release();
 }
 
-void Key::decodieren(Bytes* daten)
+void Key::decode2(Bytes* daten)
 {
     if (!key || !length)
     {

Key.h

@@ -90,10 +90,10 @@ namespace Framework
             DLLEXPORT void setKey(const char* s, int length);
             //! Encrypts a byte array with the set key
             //! \param daten The byte array to encrypt. Modified by the function
-            DLLEXPORT void codieren(Bytes* daten);
+            DLLEXPORT void encode2(Bytes* daten);
             //! Decrypts a byte array with the set key
             //! \param daten The byte array to decrypt. Modified by the function
-            DLLEXPORT void decodieren(Bytes* daten);
+            DLLEXPORT void decode2(Bytes* daten);
         };
     } // namespace Encryption
 } // namespace Framework

KeyboardEvent.cpp

@@ -7,9 +7,9 @@ bool Framework::_ret1TE(void* param, void* obj, KeyboardEvent te)
     return 1;
 }
 
-bool Framework::_nurNummernTE(void* param, void* obj, KeyboardEvent te)
+bool Framework::_onlyNumbersTE(void* param, void* obj, KeyboardEvent te)
 {
-    if (te.taste[0] >= '0' && te.taste[0] <= '9') return 1;
+    if (te.key[0] >= '0' && te.key[0] <= '9') return 1;
     if (te.virtualKey == T_Entf || te.virtualKey == T_BackSpace) return 1;
     if (te.virtualKey == T_Links || te.virtualKey == T_Rechts
         || te.virtualKey == T_Unten || te.virtualKey == T_Oben)
@@ -17,11 +17,11 @@ bool Framework::_nurNummernTE(void* param, void* obj, KeyboardEvent te)
     return 0;
 }
 
-bool Framework::_nurHexTE(void* param, void* obj, KeyboardEvent te)
+bool Framework::_onlyHexTE(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;
-    if (te.taste[0] >= 'a' && te.taste[0] <= 'f') return 1;
+    if (te.key[0] >= '0' && te.key[0] <= '9') return 1;
+    if (te.key[0] >= 'A' && te.key[0] <= 'F') return 1;
+    if (te.key[0] >= 'a' && te.key[0] <= 'f') return 1;
     if (te.virtualKey == T_Entf || te.virtualKey == T_BackSpace) return 1;
     if (te.virtualKey == T_Links || te.virtualKey == T_Rechts
         || te.virtualKey == T_Unten || te.virtualKey == T_Oben)

KeyboardEvent.h

@@ -91,14 +91,14 @@ namespace Framework
         //! Type of input
         int id;
         //! Affected key
-        char taste[3];
+        char key[3];
         //! virtual key code
         int virtualKey;
         //! (true) if the input has already been processed. (false) otherwise
-        bool verarbeitet;
+        bool processed;
     };
 
-    typedef std::function<bool(void*, void*, KeyboardEvent)> TastaturAktion;
+    typedef std::function<bool(void*, void*, KeyboardEvent)> KeyboardAction;
 
     //! Default keyboard event callback function
     //! \param param An arbitrary parameter
@@ -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, KeyboardEvent te);
+    DLLEXPORT bool _onlyNumbersTE(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, KeyboardEvent te);
+    DLLEXPORT bool _onlyHexTE(void* param, void* obj, KeyboardEvent te);
 } // namespace Framework
 
 #endif

List.cpp

@@ -19,17 +19,17 @@ using namespace Framework;
 SelectionList::SelectionList()
     : DrawableBackground(),
       tfListe(0),
-      auswahl(-1),
-      ahFarbe(0xFF000000),
+      selection(-1),
+      ahColor(0xFF000000),
       ahImage(0),
       aBuffer(0),
       aBorder(0),
       styles(0),
-      ahFarbeListe(0),
+      ahColorListe(0),
       ahImageListe(0),
       aBufferListe(0),
       aBorderList(0),
-      schrift(0)
+      font(0)
 {
     style = 0;
     this->setMouseEvent(_ret1ME);
@@ -44,55 +44,55 @@ SelectionList::~SelectionList()
     if (aBuffer) aBuffer->release();
     if (aBorder) aBorder->release();
     if (styles) styles->release();
-    if (ahFarbeListe) ahFarbeListe->release();
+    if (ahColorListe) ahColorListe->release();
     if (ahImageListe) ahImageListe->release();
     if (aBufferListe) aBufferListe->release();
     if (aBorderList) aBorderList->release();
-    if (schrift) schrift->release();
+    if (font) font->release();
 }
 
 void SelectionList::doMouseEvent(MouseEvent& me, bool userRet)
 {
-    if (!userRet || hatStyleNicht(Style::Erlaubt)) return;
-    if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
+    if (!userRet || hasStyleNot(Style::Allowed)) return;
+    if (DrawableBackground::hasStyle(Style::VScroll) && vertikalScrollBar)
     {
         int rbr = 0;
-        if (rahmen && DrawableBackground::hatStyle(Style::Border))
-            rbr = rahmen->getRBreite();
+        if (border && DrawableBackground::hasStyle(Style::Border))
+            rbr = border->getRWidth();
         if (((me.mx > gr.x - 15 - rbr) || me.id == ME_UScroll
                 || me.id == ME_DScroll)
-            && me.id != ME_Betritt && me.id != ME_Leaves)
+            && me.id != ME_Enter && me.id != ME_Leaves)
         {
-            vertikalScrollBar->doMausMessage(
+            vertikalScrollBar->doMouseMessage(
                 gr.x - rbr - 15, rbr, 15, gr.y - rbr * 2, me);
-            me.verarbeitet = 1;
+            me.processed = 1;
         }
     }
-    if (!me.verarbeitet && me.id == ME_RLinks)
+    if (!me.processed && me.id == ME_RLeft)
     {
-        int eintr = getKlickEintrag(me.my);
+        int eintr = getClickEntry(me.my);
         if (eintr >= 0)
         {
-            if (hatStyleNicht(Style::MultiSelect))
+            if (hasStyleNot(Style::MultiSelect))
             {
-                auswahl = eintr;
+                selection = eintr;
                 rend = 1;
             }
             else
             {
-                bool shift = getTastenStand(T_Shift);
-                bool strg = getTastenStand(T_Strg);
+                bool shift = getKeyState(T_Shift);
+                bool strg = getKeyState(T_Strg);
                 if (strg)
                 {
                     setMsStyle(eintr,
                         Style::Selected,
-                        hatMsStyleNicht(eintr, Style::Selected));
-                    auswahl = eintr;
+                        hasMsStyleNot(eintr, Style::Selected));
+                    selection = eintr;
                 }
-                else if (shift && auswahl != -1)
+                else if (shift && selection != -1)
                 {
-                    deSelect();
-                    int beg = auswahl, end = eintr;
+                    deselect();
+                    int beg = selection, end = eintr;
                     if (beg > end)
                     {
                         int tmp = end;
@@ -106,19 +106,19 @@ void SelectionList::doMouseEvent(MouseEvent& me, bool userRet)
                 }
                 else
                 {
-                    deSelect();
+                    deselect();
                     addMsStyle(eintr, Style::Selected);
-                    auswahl = eintr;
+                    selection = eintr;
                 }
             }
         }
         else
-            deSelect();
+            deselect();
     }
-    me.verarbeitet = 1;
+    me.processed = 1;
 }
 
-bool SelectionList::hatStyle(int styleSet, int styleCheck) const
+bool SelectionList::hasStyle(int styleSet, int styleCheck) const
 {
     return (styleSet | styleCheck) == styleSet;
 }
@@ -127,118 +127,118 @@ bool SelectionList::hatStyle(int styleSet, int styleCheck) const
 void SelectionList::update() // updates the selection list
 {
     int rbr = 0;
-    if (rahmen)
+    if (border)
     {
-        rbr = rahmen->getRBreite();
-        rahmen->setPosition(0, 0);
-        rahmen->setSize(gr.x, gr.y);
+        rbr = border->getRWidth();
+        border->setPosition(0, 0);
+        border->setSize(gr.x, gr.y);
     }
-    if (hintergrundFeld)
+    if (backgroundFeld)
     {
-        hintergrundFeld->setPosition(rbr, rbr);
-        hintergrundFeld->setSize(gr.x - rbr * 2, gr.y - rbr * 2);
+        backgroundFeld->setPosition(rbr, rbr);
+        backgroundFeld->setSize(gr.x - rbr * 2, gr.y - rbr * 2);
     }
-    if (hatStyleNicht(Style::MultiStyled) && tfListe)
+    if (hasStyleNot(Style::MultiStyled) && tfListe)
     {
-        bool FieldBorder = DrawableBackground::hatStyle(Style::FieldBorder);
-        bool FeldHintergrund
-            = DrawableBackground::hatStyle(Style::FeldHintergrund);
-        bool FeldHImage = DrawableBackground::hatStyle(Style::FeldHImage);
-        bool FeldHAlpha = DrawableBackground::hatStyle(Style::FeldHAlpha);
-        bool FeldBuffer = DrawableBackground::hatStyle(Style::FeldBuffer);
+        bool FieldBorder = DrawableBackground::hasStyle(Style::FieldBorder);
+        bool FieldBackground
+            = DrawableBackground::hasStyle(Style::FieldBackground);
+        bool FieldHImage = DrawableBackground::hasStyle(Style::FieldHImage);
+        bool FieldHAlpha = DrawableBackground::hasStyle(Style::FieldHAlpha);
+        bool FieldBuffer = DrawableBackground::hasStyle(Style::FieldBuffer);
         for (TextField* tf : *tfListe)
         {
             tf->setStyle(TextField::Style::Border, FieldBorder);
-            tf->setStyle(TextField::Style::Hintergrund, FeldHintergrund);
-            tf->setStyle(TextField::Style::HImage, FeldHImage);
-            tf->setStyle(TextField::Style::HAlpha, FeldHAlpha);
-            tf->setStyle(TextField::Style::Buffered, FeldBuffer);
-            if (schrift)
-                tf->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
+            tf->setStyle(TextField::Style::Background, FieldBackground);
+            tf->setStyle(TextField::Style::HImage, FieldHImage);
+            tf->setStyle(TextField::Style::HAlpha, FieldHAlpha);
+            tf->setStyle(TextField::Style::Buffered, FieldBuffer);
+            if (font)
+                tf->setFontZ(dynamic_cast<Font*>(font->getThis()));
         }
     }
-    if (DrawableBackground::hatStyle(Style::MultiStyled) && tfListe && styles)
+    if (DrawableBackground::hasStyle(Style::MultiStyled) && tfListe && styles)
     {
         auto style = styles->begin();
         for (auto tf = tfListe->begin(); tf; tf++, style++)
         {
             tf->setStyle(
-                TextField::Style::Border, hatStyle(style, Style::FieldBorder));
-            tf->setStyle(TextField::Style::Hintergrund,
-                hatStyle(style, Style::FeldHintergrund));
+                TextField::Style::Border, hasStyle(style, Style::FieldBorder));
+            tf->setStyle(TextField::Style::Background,
+                hasStyle(style, Style::FieldBackground));
             tf->setStyle(
-                TextField::Style::HImage, hatStyle(style, Style::FeldHImage));
+                TextField::Style::HImage, hasStyle(style, Style::FieldHImage));
             tf->setStyle(
-                TextField::Style::HAlpha, hatStyle(style, Style::FeldHAlpha));
+                TextField::Style::HAlpha, hasStyle(style, Style::FieldHAlpha));
             tf->setStyle(
-                TextField::Style::Buffered, hatStyle(style, Style::FeldBuffer));
+                TextField::Style::Buffered, hasStyle(style, Style::FieldBuffer));
         }
     }
     rend = 1;
 }
 
-void SelectionList::addEintrag(Text* txt) // adds an entry
+void SelectionList::addEntry(Text* txt) // adds an entry
 {
     TextField* tf = new TextField();
-    tf->setStyle(TextField::Style::Center | TextField::Style::Sichtbar
+    tf->setStyle(TextField::Style::Center | TextField::Style::Visible
                  | TextField::Style::Border);
-    tf->setSchriftFarbe(0xFFFFFFFF);
+    tf->setFontColor(0xFFFFFFFF);
     tf->setBorderWidth(1);
     tf->setBorderColor(0xFFFFFFFF);
     tf->setTextZ(txt);
     tf->setSize(0, 20);
-    addEintragZ(tf);
+    addEntryZ(tf);
     rend = 1;
 }
 
-void SelectionList::addEintrag(const char* txt)
+void SelectionList::addEntry(const char* txt)
 {
     Text* tx = new Text(txt);
-    addEintrag(tx);
+    addEntry(tx);
     rend = 1;
 }
 
-void SelectionList::addEintragZ(TextField* tf)
+void SelectionList::addEntryZ(TextField* tf)
 {
     if (!tfListe) tfListe = new RCArray<TextField>();
-    if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
-        tf->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
+    if (font && (!tf->zFont() || hasStyleNot(Style::MultiStyled)))
+        tf->setFontZ(dynamic_cast<Font*>(font->getThis()));
     tfListe->add(tf);
     rend = 1;
 }
 
-void SelectionList::addEintrag(
+void SelectionList::addEntry(
     int pos, Text* txt) // inserts an entry at position pos
 {
     TextField* tf = new TextField();
-    tf->setStyle(TextField::Style::Center | TextField::Style::Sichtbar
+    tf->setStyle(TextField::Style::Center | TextField::Style::Visible
                  | TextField::Style::Border);
-    tf->setSchriftFarbe(0xFFFFFFFF);
+    tf->setFontColor(0xFFFFFFFF);
     tf->setBorderWidth(1);
     tf->setBorderColor(0xFFFFFFFF);
     tf->setTextZ(txt);
     tf->setSize(0, 20);
-    addEintragZ(pos, tf);
+    addEntryZ(pos, tf);
     rend = 1;
 }
 
-void SelectionList::addEintrag(int pos, const char* txt)
+void SelectionList::addEntry(int pos, const char* txt)
 {
     Text* tx = new Text(txt);
-    addEintrag(pos, tx);
+    addEntry(pos, tx);
     rend = 1;
 }
 
-void SelectionList::addEintragZ(int pos, TextField* tf)
+void SelectionList::addEntryZ(int pos, TextField* tf)
 {
     if (!tfListe) tfListe = new RCArray<TextField>();
-    if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
-        tf->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
+    if (font && (!tf->zFont() || hasStyleNot(Style::MultiStyled)))
+        tf->setFontZ(dynamic_cast<Font*>(font->getThis()));
     tfListe->add(tf, pos);
     rend = 1;
 }
 
-void SelectionList::setEintrag(
+void SelectionList::setEntry(
     int pos, Text* txt) // changes the entry at pos
 {
     TextField* tf = 0;
@@ -246,14 +246,14 @@ void SelectionList::setEintrag(
     if (!tf)
     {
         tf = new TextField();
-        tf->setStyle(TextField::Style::Center | TextField::Style::Sichtbar
+        tf->setStyle(TextField::Style::Center | TextField::Style::Visible
                      | TextField::Style::Border);
-        tf->setSchriftFarbe(0xFFFFFFFF);
+        tf->setFontColor(0xFFFFFFFF);
         tf->setBorderColor(0xFFFFFFFF);
         tf->setBorderWidth(1);
         tf->setTextZ(txt);
         tf->setSize(0, 20);
-        setEintragZ(pos, tf);
+        setEntryZ(pos, tf);
         rend = 1;
         return;
     }
@@ -261,43 +261,43 @@ void SelectionList::setEintrag(
     rend = 1;
 }
 
-void SelectionList::setEintrag(int pos, const char* txt)
+void SelectionList::setEntry(int pos, const char* txt)
 {
     Text* tx = new Text(txt);
-    setEintrag(pos, tx);
+    setEntry(pos, tx);
     rend = 1;
 }
 
-void SelectionList::setEintragZ(int pos, TextField* tf)
+void SelectionList::setEntryZ(int pos, TextField* tf)
 {
     if (!tfListe) tfListe = new RCArray<TextField>();
-    if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
-        tf->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
+    if (font && (!tf->zFont() || hasStyleNot(Style::MultiStyled)))
+        tf->setFontZ(dynamic_cast<Font*>(font->getThis()));
     tfListe->set(tf, pos);
     rend = 1;
 }
 
-void SelectionList::tauschEintragPos(
+void SelectionList::swapEntryPos(
     int vpos, int npos) // swaps entry vpos with entry npos
 {
     if (tfListe)
     {
-        tfListe->tausch(vpos, npos);
-        if (styles) styles->tausch(vpos, npos);
-        if (ahFarbeListe) ahFarbeListe->tausch(vpos, npos);
-        if (ahImageListe) ahImageListe->tausch(vpos, npos);
-        if (aBufferListe) aBufferListe->tausch(vpos, npos);
-        if (aBorderList) aBorderList->tausch(vpos, npos);
+        tfListe->swap(vpos, npos);
+        if (styles) styles->swap(vpos, npos);
+        if (ahColorListe) ahColorListe->swap(vpos, npos);
+        if (ahImageListe) ahImageListe->swap(vpos, npos);
+        if (aBufferListe) aBufferListe->swap(vpos, npos);
+        if (aBorderList) aBorderList->swap(vpos, npos);
         rend = 1;
     }
 }
 
-void Framework::SelectionList::setEintragPos(int vpos, int npos) {
+void Framework::SelectionList::setEntryPos(int vpos, int npos) {
     if (tfListe)
     {
         tfListe->setPosition(vpos, npos);
         if (styles) styles->setPosition(vpos, npos);
-        if (ahFarbeListe) ahFarbeListe->setPosition(vpos, npos);
+        if (ahColorListe) ahColorListe->setPosition(vpos, npos);
         if (ahImageListe) ahImageListe->setPosition(vpos, npos);
         if (aBufferListe) aBufferListe->setPosition(vpos, npos);
         if (aBorderList) aBorderList->setPosition(vpos, npos);
@@ -305,28 +305,28 @@ void Framework::SelectionList::setEintragPos(int vpos, int npos) {
     }
 }
 
-void SelectionList::removeEintrag(int pos) // deletes entry at pos
+void SelectionList::removeEntry(int pos) // deletes entry at pos
 {
     tfListe->remove(pos);
     rend = 1;
 }
 
 void SelectionList::setFontZ(
-    Font* schrift) // sets the font for the entries
+    Font* font) // sets the font for the entries
 {
-    if (this->schrift) this->schrift->release();
-    this->schrift = schrift;
+    if (this->font) this->font->release();
+    this->font = font;
     rend = 1;
 }
 
-void SelectionList::setVScrollZuEintrag(int eintrag) // scrolls to entry
+void SelectionList::setVScrollToEntry(int entry) // scrolls to entry
 {
     if (vertikalScrollBar)
     {
-        if (eintrag > tfListe->getLastIndex())
-            eintrag = tfListe->getLastIndex();
+        if (entry > tfListe->getLastIndex())
+            entry = tfListe->getLastIndex();
         int y = 0;
-        for (int i = 0; i < eintrag; i++)
+        for (int i = 0; i < entry; i++)
             y += tfListe->z(i) ? tfListe->z(i)->getHeight() : 0;
         vertikalScrollBar->scroll(y);
     }
@@ -342,35 +342,35 @@ void SelectionList::updateVScroll() // scrolls to cursor position or
             y += (TextField*)tf ? tf->getHeight() : 0;
         vertikalScrollBar->update(y,
             gr.y
-                - ((rahmen
-                       && DrawableBackground::hatStyle(
+                - ((border
+                       && DrawableBackground::hasStyle(
                            TextField::Style::Border))
-                        ? rahmen->getRBreite()
+                        ? border->getRWidth()
                         : 0));
     }
 }
 
 void SelectionList::setALRZ(Border*
-        rahmen) // sets a pointer to the selection border (only without MultiStyled)
+        border) // sets a pointer to the selection border (only without MultiStyled)
 {
     if (aBorder) aBorder->release();
-    aBorder = rahmen;
+    aBorder = border;
     rend = 1;
 }
 
-void SelectionList::setALRBreite(
+void SelectionList::setALRWidth(
     int br) // sets the width of the selection border (only without MultiStyled)
 {
     if (!aBorder) aBorder = new LBorder();
-    aBorder->setRamenBreite(br);
+    aBorder->setBorderWidth(br);
     rend = 1;
 }
 
-void SelectionList::setALRFarbe(
+void SelectionList::setALRColor(
     int fc) // sets the color of the selection border (only without MultiStyled)
 {
     if (!aBorder) aBorder = new LBorder();
-    aBorder->setFarbe(fc);
+    aBorder->setColor(fc);
     rend = 1;
 }
 
@@ -391,12 +391,12 @@ void SelectionList::setAAFStrength(
     rend = 1;
 }
 
-void SelectionList::setAAFFarbe(
+void SelectionList::setAAFColor(
     int fc) // sets the color of the selection background buffer (only without
             // MultiStyled)
 {
     if (!aBuffer) aBuffer = new AlphaField();
-    aBuffer->setFarbe(fc);
+    aBuffer->setColor(fc);
     rend = 1;
 }
 
@@ -404,19 +404,19 @@ void SelectionList::setAHImage(
     Image* bild) // sets the selection background image (only without MultiStyled)
 {
     if (!ahImage) ahImage = new Image();
-    ahImage->neuImage(bild->getBreite(), bild->getHeight(), 0);
+    ahImage->newImage(bild->getWidth(), bild->getHeight(), 0);
     int* buff1 = ahImage->getBuffer();
     int* buff2 = bild->getBuffer();
-    for (int i = 0; i < bild->getBreite() * bild->getHeight(); ++i)
+    for (int i = 0; i < bild->getWidth() * bild->getHeight(); ++i)
         buff1[i] = buff2[i];
     bild->release();
     rend = 1;
 }
 
-void SelectionList::setAHFarbe(int f) // sets the selection
+void SelectionList::setAHColor(int f) // sets the selection
                                       // background color (only without MultiStyled)
 {
-    ahFarbe = f;
+    ahColor = f;
     rend = 1;
 }
 
@@ -430,28 +430,28 @@ void SelectionList::setAHImageZ(
 
 void SelectionList::setALRZ(int pos,
     Border*
-        rahmen) // sets a pointer to the selection border (only with MultiStyled)
+        border) // sets a pointer to the selection border (only with MultiStyled)
 {
     if (!aBorderList) aBorderList = new RCArray<Border>();
-    aBorderList->set(rahmen, pos);
+    aBorderList->set(border, pos);
     rend = 1;
 }
 
-void SelectionList::setALRBreite(int pos,
+void SelectionList::setALRWidth(int pos,
     int br) // sets the width of the selection border (only with MultiStyled)
 {
     if (!aBorderList) aBorderList = new RCArray<Border>();
     if (!aBorderList->z(pos)) aBorderList->set(new LBorder(), pos);
-    aBorderList->z(pos)->setRamenBreite(br);
+    aBorderList->z(pos)->setBorderWidth(br);
     rend = 1;
 }
 
-void SelectionList::setALRFarbe(int pos,
+void SelectionList::setALRColor(int pos,
     int fc) // sets the color of the selection border (only with MultiStyled)
 {
     if (!aBorderList) aBorderList = new RCArray<Border>();
     if (!aBorderList->z(pos)) aBorderList->set(new LBorder(), pos);
-    aBorderList->z(pos)->setFarbe(fc);
+    aBorderList->z(pos)->setColor(fc);
     rend = 1;
 }
 
@@ -474,13 +474,13 @@ void SelectionList::setAAFStrength(
     rend = 1;
 }
 
-void SelectionList::setAAFFarbe(
+void SelectionList::setAAFColor(
     int pos, int fc) // sets the color of the selection background buffer
                      // (only with MultiStyled)
 {
     if (!aBufferListe) aBufferListe = new RCArray<AlphaField>();
     if (!aBufferListe->z(pos)) aBufferListe->set(new AlphaField(), pos);
-    aBufferListe->z(pos)->setFarbe(fc);
+    aBufferListe->z(pos)->setColor(fc);
     rend = 1;
 }
 
@@ -489,21 +489,21 @@ void SelectionList::setAHImage(int pos,
 {
     if (ahImageListe) ahImageListe = new RCArray<Image>();
     if (!ahImageListe->z(pos)) ahImageListe->set(new Image(), pos);
-    ahImageListe->z(pos)->neuImage(bild->getBreite(), bild->getHeight(), 0);
+    ahImageListe->z(pos)->newImage(bild->getWidth(), bild->getHeight(), 0);
     int* buff1 = ahImageListe->z(pos)->getBuffer();
     int* buff2 = bild->getBuffer();
-    for (int i = 0; i < bild->getBreite() * bild->getHeight(); ++i)
+    for (int i = 0; i < bild->getWidth() * bild->getHeight(); ++i)
         buff1[i] = buff2[i];
     bild->release();
     rend = 1;
 }
 
-void SelectionList::setAHFarbe(
+void SelectionList::setAHColor(
     int pos, int f) // sets the selection background color
                     // (only with MultiStyled)
 {
-    if (ahFarbeListe) ahFarbeListe = new Array<int>();
-    ahFarbeListe->set(f, pos);
+    if (ahColorListe) ahColorListe = new Array<int>();
+    ahColorListe->set(f, pos);
     rend = 1;
 }
 
@@ -549,26 +549,26 @@ void SelectionList::removeMsStyle(int pos, __int64 style)
 
 void SelectionList::doKeyboardEvent(KeyboardEvent& te)
 {
-    bool ntakc = !te.verarbeitet;
-    if (hatStyleNicht(Style::Fokus) || !tak || te.verarbeitet) return;
+    bool ntakc = !te.processed;
+    if (hasStyleNot(Style::Focus) || !tak || te.processed) return;
     getThis();
     if (tak(takParam, this, te))
     {
         if (te.id == TE_Press)
         {
-            if (hatStyleNicht(Style::MultiSelect))
+            if (hasStyleNot(Style::MultiSelect))
             {
                 switch (te.virtualKey)
                 {
                 case T_Unten:
-                    ++auswahl;
-                    if (auswahl > tfListe->getEntryCount())
-                        auswahl = tfListe->getEntryCount();
+                    ++selection;
+                    if (selection > tfListe->getEntryCount())
+                        selection = tfListe->getEntryCount();
                     rend = 1;
                     break;
                 case T_Oben:
-                    --auswahl;
-                    if (auswahl < -1) auswahl = -1;
+                    --selection;
+                    if (selection < -1) selection = -1;
                     rend = 1;
                     break;
                 }
@@ -578,33 +578,33 @@ void SelectionList::doKeyboardEvent(KeyboardEvent& te)
                 switch (te.virtualKey)
                 {
                 case T_Unten:
-                    deSelect();
-                    ++auswahl;
-                    if (auswahl > tfListe->getEntryCount())
-                        auswahl = tfListe->getEntryCount();
-                    if (auswahl >= 0) addMsStyle(auswahl, Style::Selected);
+                    deselect();
+                    ++selection;
+                    if (selection > tfListe->getEntryCount())
+                        selection = tfListe->getEntryCount();
+                    if (selection >= 0) addMsStyle(selection, Style::Selected);
                     rend = 1;
                     break;
                 case T_Oben:
-                    deSelect();
-                    --auswahl;
-                    if (auswahl < -1) auswahl = -1;
-                    if (auswahl >= 0) addMsStyle(auswahl, Style::Selected);
+                    deselect();
+                    --selection;
+                    if (selection < -1) selection = -1;
+                    if (selection >= 0) addMsStyle(selection, Style::Selected);
                     rend = 1;
                     break;
                 }
             }
         }
-        te.verarbeitet = 1;
+        te.processed = 1;
     }
-    if (ntakc && te.verarbeitet && nTak)
-        te.verarbeitet = nTak(ntakParam, this, te);
+    if (ntakc && te.processed && nTak)
+        te.processed = nTak(ntakParam, this, te);
     release();
 }
 
 void SelectionList::render(Image& zRObj) // draws to zRObj
 {
-    if (!DrawableBackground::hatStyle(Style::Sichtbar)) return;
+    if (!DrawableBackground::hasStyle(Style::Visible)) return;
     removeStyle(Style::HScroll);
     DrawableBackground::render(zRObj);
     lockDrawable();
@@ -614,13 +614,13 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
         return;
     }
     int rbr = 0;
-    if (rahmen && DrawableBackground::hatStyle(Style::Border))
-        rbr = rahmen->getRBreite();
+    if (border && DrawableBackground::hasStyle(Style::Border))
+        rbr = border->getRWidth();
     if (tfListe)
     {
         int maxHeight = 0;
         int dx = 0, dy = 0;
-        if (vertikalScrollBar && DrawableBackground::hatStyle(Style::VScroll))
+        if (vertikalScrollBar && DrawableBackground::hasStyle(Style::VScroll))
             dy -= vertikalScrollBar->getScroll();
         int mdy = innenSize.y + rbr;
         auto style = styles ? styles->begin() : Array<__int64>().begin();
@@ -629,19 +629,19 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
         {
             if (dy + tf->getHeight() > mdy
                 && !(vertikalScrollBar
-                     && DrawableBackground::hatStyle(Style::VScroll)))
+                     && DrawableBackground::hasStyle(Style::VScroll)))
                 break;
             tf->setPosition(dx, dy);
             tf->setSize(innenSize.x, tf->getHeight());
             maxHeight += tf->getHeight();
             bool selected = 0;
-            if (DrawableBackground::hatStyle(Style::MultiSelect) && styles)
-                selected = hatStyle(style, Style::Selected);
+            if (DrawableBackground::hasStyle(Style::MultiSelect) && styles)
+                selected = hasStyle(style, Style::Selected);
             else
-                selected = auswahl == i;
+                selected = selection == i;
             AlphaField* tmpBuffer = 0;
             bool tmpB = 0;
-            int tmpHFarbe = 0;
+            int tmpHColor = 0;
             bool tmpH = 0;
             Image* tmpHImage = 0;
             bool tmpHB = 0;
@@ -650,128 +650,128 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
             bool tmpR = 0;
             if (selected)
             {
-                if (hatStyleNicht(Style::MultiStyled) || !styles)
+                if (hasStyleNot(Style::MultiStyled) || !styles)
                 {
-                    if (DrawableBackground::hatStyle(Style::AuswahlBuffer)
+                    if (DrawableBackground::hasStyle(Style::SelectionBuffer)
                         && aBuffer)
                     {
                         tmpBuffer = tf->getAlphaField();
                         tf->setAlphaFieldZ(
                             dynamic_cast<AlphaField*>(aBuffer->getThis()));
-                        tmpB = tf->hatStyle(TextField::Style::Buffered);
+                        tmpB = tf->hasStyle(TextField::Style::Buffered);
                         tf->setStyle(TextField::Style::Buffered,
-                            DrawableBackground::hatStyle(
-                                Style::AuswahlBuffer));
+                            DrawableBackground::hasStyle(
+                                Style::SelectionBuffer));
                     }
-                    if (DrawableBackground::hatStyle(
-                            Style::AuswahlHintergrund))
+                    if (DrawableBackground::hasStyle(
+                            Style::SelectionBackground))
                     {
-                        tmpH = tf->hatStyle(TextField::Style::Hintergrund);
-                        tmpHFarbe = tf->getHintergrundFarbe();
-                        tf->setHintergrundFarbe(ahFarbe);
-                        tf->setStyle(TextField::Style::Hintergrund,
-                            DrawableBackground::hatStyle(Style::Hintergrund));
-                        if (DrawableBackground::hatStyle(Style::AuswahlHImage)
+                        tmpH = tf->hasStyle(TextField::Style::Background);
+                        tmpHColor = tf->getBackgroundColor();
+                        tf->setBackgroundColor(ahColor);
+                        tf->setStyle(TextField::Style::Background,
+                            DrawableBackground::hasStyle(Style::Background));
+                        if (DrawableBackground::hasStyle(Style::SelectionHImage)
                             && ahImage)
                         {
-                            tmpHImage = tf->getHintergrundImage();
-                            tf->setHintergrundImageZ(
+                            tmpHImage = tf->getBackgroundImage();
+                            tf->setBackgroundImageZ(
                                 dynamic_cast<Image*>(ahImage->getThis()));
-                            tmpHB = tf->hatStyle(TextField::Style::HImage);
+                            tmpHB = tf->hasStyle(TextField::Style::HImage);
                             tf->setStyle(TextField::Style::HImage,
-                                DrawableBackground::hatStyle(Style::HImage));
+                                DrawableBackground::hasStyle(Style::HImage));
                         }
-                        if (DrawableBackground::hatStyle(
-                                Style::AuswahlHAlpha))
+                        if (DrawableBackground::hasStyle(
+                                Style::SelectionHAlpha))
                         {
-                            tmpHAlpha = tf->hatStyle(TextField::Style::HAlpha);
+                            tmpHAlpha = tf->hasStyle(TextField::Style::HAlpha);
                             tf->setStyle(TextField::Style::HAlpha,
-                                DrawableBackground::hatStyle(
-                                    Style::AuswahlHAlpha));
+                                DrawableBackground::hasStyle(
+                                    Style::SelectionHAlpha));
                         }
                     }
-                    if (DrawableBackground::hatStyle(Style::SelectionBorder)
+                    if (DrawableBackground::hasStyle(Style::SelectionBorder)
                         && aBorder)
                     {
                         tmpBorder = tf->getBorder();
                         tf->setBorderZ(
                             dynamic_cast<Border*>(aBorder->getThis()));
-                        tmpR = tf->hatStyle(TextField::Style::Border);
+                        tmpR = tf->hasStyle(TextField::Style::Border);
                         tf->setStyle(TextField::Style::Border,
-                            DrawableBackground::hatStyle(
+                            DrawableBackground::hasStyle(
                                 Style::SelectionBorder));
                     }
                 }
                 else
                 {
-                    if (hatStyle(style, Style::AuswahlBuffer) && aBufferListe)
+                    if (hasStyle(style, Style::SelectionBuffer) && aBufferListe)
                     {
                         tmpBuffer = tf->getAlphaField();
                         tf->setAlphaFieldZ(aBufferListe->get(i));
-                        tmpB = tf->hatStyle(TextField::Style::Buffered);
+                        tmpB = tf->hasStyle(TextField::Style::Buffered);
                         tf->setStyle(TextField::Style::Buffered,
-                            hatStyle(style, Style::AuswahlBuffer));
+                            hasStyle(style, Style::SelectionBuffer));
                     }
-                    if (hatStyle(style, Style::AuswahlHintergrund))
+                    if (hasStyle(style, Style::SelectionBackground))
                     {
-                        tmpH = tf->hatStyle(Style::Hintergrund);
-                        tf->setStyle(TextField::Style::Hintergrund,
-                            hatStyle(style, Style::AuswahlHintergrund));
-                        if (ahFarbeListe && ahFarbeListe->hat(i))
+                        tmpH = tf->hasStyle(Style::Background);
+                        tf->setStyle(TextField::Style::Background,
+                            hasStyle(style, Style::SelectionBackground));
+                        if (ahColorListe && ahColorListe->has(i))
                         {
-                            tmpHFarbe = tf->getHintergrundFarbe();
-                            tf->setHintergrundFarbe(ahFarbeListe->get(i));
+                            tmpHColor = tf->getBackgroundColor();
+                            tf->setBackgroundColor(ahColorListe->get(i));
                         }
-                        if (hatStyle(style, Style::AuswahlHImage) && ahImageListe)
+                        if (hasStyle(style, Style::SelectionHImage) && ahImageListe)
                         {
-                            tmpHImage = tf->getHintergrundImage();
-                            tf->setHintergrundImageZ(ahImageListe->get(i));
-                            tmpHB = tf->hatStyle(TextField::Style::HImage);
+                            tmpHImage = tf->getBackgroundImage();
+                            tf->setBackgroundImageZ(ahImageListe->get(i));
+                            tmpHB = tf->hasStyle(TextField::Style::HImage);
                             tf->setStyle(TextField::Style::HImage,
-                                hatStyle(style, Style::HImage));
+                                hasStyle(style, Style::HImage));
                         }
-                        if (hatStyle(style, Style::AuswahlHAlpha))
+                        if (hasStyle(style, Style::SelectionHAlpha))
                         {
-                            tmpHAlpha = tf->hatStyle(TextField::Style::HAlpha);
+                            tmpHAlpha = tf->hasStyle(TextField::Style::HAlpha);
                             tf->setStyle(TextField::Style::HAlpha,
-                                hatStyle(style, Style::AuswahlHAlpha));
+                                hasStyle(style, Style::SelectionHAlpha));
                         }
                     }
-                    if (hatStyle(style, Style::SelectionBorder) && aBorderList)
+                    if (hasStyle(style, Style::SelectionBorder) && aBorderList)
                     {
                         tmpBorder = tf->getBorder();
                         tf->setBorderZ(aBorderList->get(i));
-                        tmpR = tf->hatStyle(TextField::Style::Border);
+                        tmpR = tf->hasStyle(TextField::Style::Border);
                         tf->setStyle(TextField::Style::Border,
-                            hatStyle(style, Style::SelectionBorder));
+                            hasStyle(style, Style::SelectionBorder));
                     }
                 }
             }
             tf->render(zRObj);
             if (selected)
             {
-                if (hatStyleNicht(Style::MultiStyled) || !styles)
+                if (hasStyleNot(Style::MultiStyled) || !styles)
                 {
-                    if (DrawableBackground::hatStyle(Style::AuswahlBuffer))
+                    if (DrawableBackground::hasStyle(Style::SelectionBuffer))
                     {
                         tf->setAlphaFieldZ(tmpBuffer);
                         tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
-                    if (DrawableBackground::hatStyle(
-                            Style::AuswahlHintergrund))
+                    if (DrawableBackground::hasStyle(
+                            Style::SelectionBackground))
                     {
-                        tf->setHintergrundFarbe(tmpHFarbe);
-                        tf->setStyle(TextField::Style::Hintergrund, tmpH);
-                        if (DrawableBackground::hatStyle(Style::AuswahlHImage))
+                        tf->setBackgroundColor(tmpHColor);
+                        tf->setStyle(TextField::Style::Background, tmpH);
+                        if (DrawableBackground::hasStyle(Style::SelectionHImage))
                         {
-                            tf->setHintergrundImageZ(tmpHImage);
+                            tf->setBackgroundImageZ(tmpHImage);
                             tf->setStyle(TextField::Style::HImage, tmpHB);
                         }
-                        if (DrawableBackground::hatStyle(
-                                Style::AuswahlHAlpha))
+                        if (DrawableBackground::hasStyle(
+                                Style::SelectionHAlpha))
                             tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
                     }
-                    if (DrawableBackground::hatStyle(Style::SelectionBorder))
+                    if (DrawableBackground::hasStyle(Style::SelectionBorder))
                     {
                         tf->setBorderZ(tmpBorder);
                         tf->setStyle(TextField::Style::Border, tmpR);
@@ -779,25 +779,25 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
                 }
                 else
                 {
-                    if (hatMsStyle(i, Style::AuswahlBuffer) && aBufferListe)
+                    if (hasMsStyle(i, Style::SelectionBuffer) && aBufferListe)
                     {
                         tf->setAlphaFieldZ(tmpBuffer);
                         tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
-                    if (hatMsStyle(i, Style::AuswahlHintergrund))
+                    if (hasMsStyle(i, Style::SelectionBackground))
                     {
-                        tf->setStyle(TextField::Style::Hintergrund, tmpH);
-                        if (ahFarbeListe && ahFarbeListe->hat(i))
-                            tf->setHintergrundFarbe(tmpHFarbe);
-                        if (hatMsStyle(i, Style::AuswahlHImage) && ahImageListe)
+                        tf->setStyle(TextField::Style::Background, tmpH);
+                        if (ahColorListe && ahColorListe->has(i))
+                            tf->setBackgroundColor(tmpHColor);
+                        if (hasMsStyle(i, Style::SelectionHImage) && ahImageListe)
                         {
-                            tf->setHintergrundImageZ(tmpHImage);
+                            tf->setBackgroundImageZ(tmpHImage);
                             tf->setStyle(TextField::Style::HImage, tmpHB);
                         }
-                        if (hatMsStyle(i, Style::AuswahlHAlpha))
+                        if (hasMsStyle(i, Style::SelectionHAlpha))
                             tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
                     }
-                    if (hatMsStyle(i, Style::SelectionBorder) && aBorderList)
+                    if (hasMsStyle(i, Style::SelectionBorder) && aBorderList)
                     {
                         tf->setBorderZ(tmpBorder);
                         tf->setStyle(TextField::Style::Border, tmpR);
@@ -813,11 +813,11 @@ void SelectionList::render(Image& zRObj) // draws to zRObj
     unlockDrawable();
 }
 
-int SelectionList::getKlickEintrag(int my)
+int SelectionList::getClickEntry(int my)
 {
     if (!tfListe) return -1;
     int y = 0;
-    if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
+    if (DrawableBackground::hasStyle(Style::VScroll) && vertikalScrollBar)
         y -= vertikalScrollBar->getScroll();
     int i = 0;
     for (auto tf = tfListe->begin(); tf; tf++, i++)
@@ -828,22 +828,22 @@ int SelectionList::getKlickEintrag(int my)
     return -1;
 }
 
-void SelectionList::setAuswahl(int ausw) // sets the selection
+void SelectionList::setSelection(int sel) // sets the selection
 {
-    if (hatStyleNicht(Style::MultiSelect))
-        auswahl = ausw;
+    if (hasStyleNot(Style::MultiSelect))
+        selection = sel;
     else if (styles)
     {
         for (int i = 0; i < styles->getEntryCount(); ++i)
             removeMsStyle(i, Style::Selected);
-        addMsStyle(ausw, Style::Selected);
+        addMsStyle(sel, Style::Selected);
     }
 }
 
-void SelectionList::deSelect()
+void SelectionList::deselect()
 {
-    if (hatStyleNicht(Style::MultiSelect))
-        auswahl = -1;
+    if (hasStyleNot(Style::MultiSelect))
+        selection = -1;
     else if (styles)
     {
         for (int i = 0; i < styles->getEntryCount(); ++i)
@@ -858,29 +858,29 @@ int SelectionList::getEntryCount()
     return tfListe ? tfListe->getEntryCount() : 0;
 }
 
-int SelectionList::getAuswahl()
+int SelectionList::getSelection()
     const // returns the first selected entry
 {
-    return auswahl;
+    return selection;
 }
 
-int SelectionList::getEintragPos(
-    Text* eintragText) // returns the position of the entry with the
+int SelectionList::getEntryPos(
+    Text* entryText) // returns the position of the entry with the
                        // corresponding text
 {
     int i = 0;
     for (auto tf = tfListe->begin(); tf; tf++, i++)
     {
-        if (tf->zText()->istGleich(eintragText->getText()))
+        if (tf->zText()->isEqual(entryText->getText()))
         {
-            eintragText->release();
+            entryText->release();
             return i;
         }
     }
     return -1;
 }
 
-TextField* SelectionList::getEintrag(
+TextField* SelectionList::getEntry(
     int pos) const // returns the entry at position pos
 {
     if (!tfListe) return 0;
@@ -889,7 +889,7 @@ TextField* SelectionList::getEintrag(
     return 0;
 }
 
-TextField* SelectionList::zEintrag(int pos) const
+TextField* SelectionList::zEntry(int pos) const
 {
     if (!tfListe) return 0;
     return (TextField*)tfListe->z(pos);
@@ -907,10 +907,10 @@ Border* SelectionList::zABorder() const
     return aBorder;
 }
 
-int SelectionList::getAHFarbe()
+int SelectionList::getAHColor()
     const // returns the selection background color (without MultiStyled)
 {
-    return ahFarbe;
+    return ahColor;
 }
 
 Image* SelectionList::getAHImage()
@@ -953,10 +953,10 @@ Border* SelectionList::zABorder(int pos) const
     return ret;
 }
 
-int SelectionList::getAHFarbe(int pos)
+int SelectionList::getAHColor(int pos)
     const // returns the selection background color (with MultiStyled)
 {
-    if (ahFarbeListe && ahFarbeListe->hat(pos)) return ahFarbeListe->get(pos);
+    if (ahColorListe && ahColorListe->has(pos)) return ahColorListe->get(pos);
     return 0;
 }
 
@@ -992,7 +992,7 @@ AlphaField* SelectionList::zABuffer(int pos) const
     return ret;
 }
 
-bool SelectionList::hatMsStyle(
+bool SelectionList::hasMsStyle(
     int pos, __int64 style) const // checks if style is present (with MultiStyled)
 {
     __int64 st = 0;
@@ -1000,7 +1000,7 @@ bool SelectionList::hatMsStyle(
     return (st | style) == st;
 }
 
-bool SelectionList::hatMsStyleNicht(int pos,
+bool SelectionList::hasMsStyleNot(int pos,
     __int64 style) const // checks if style is not present (with MultiStyled)
 {
     __int64 st = 0;
@@ -1016,7 +1016,7 @@ DrawableList::DrawableList()
     entrySeperatorColor = 0xFFFFFFFF;
     setBorderWidth(1);
     setBorderColor(0xFFFFFFFF);
-    setHintergrundFarbe(0xFF000000);
+    setBackgroundColor(0xFF000000);
 }
 
 //! Destructor
@@ -1026,26 +1026,26 @@ DrawableList::~DrawableList() {}
 //! \param me The event triggered by the mouse input
 void DrawableList::doMouseEvent(MouseEvent& me, bool userRet)
 {
-    if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
+    if (DrawableBackground::hasStyle(Style::VScroll) && vertikalScrollBar)
     {
         int rbr = 0;
-        if (rahmen && DrawableBackground::hatStyle(Style::Border))
-            rbr = rahmen->getRBreite();
+        if (border && DrawableBackground::hasStyle(Style::Border))
+            rbr = border->getRWidth();
         if (((me.mx > gr.x - 15 - rbr) || me.id == ME_UScroll
                 || me.id == ME_DScroll)
-            && me.id != ME_Betritt && me.id != ME_Leaves)
+            && me.id != ME_Enter && me.id != ME_Leaves)
         {
-            vertikalScrollBar->doMausMessage(
+            vertikalScrollBar->doMouseMessage(
                 gr.x - rbr - 15, rbr, 15, gr.y - rbr * 2, me);
-            me.verarbeitet = 1;
+            me.processed = 1;
         }
         me.my += vertikalScrollBar->getScroll();
     }
-    me.my -= (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
-               ? rahmen->getRBreite() * 2
+    me.my -= (border && DrawableBackground::hasStyle(TextField::Style::Border))
+               ? border->getRWidth() * 2
                : 0;
-    me.mx -= (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
-               ? rahmen->getRBreite() * 2
+    me.mx -= (border && DrawableBackground::hasStyle(TextField::Style::Border))
+               ? border->getRWidth() * 2
                : 0;
     int ySum = 0;
     int index = 0;
@@ -1057,11 +1057,11 @@ void DrawableList::doMouseEvent(MouseEvent& me, bool userRet)
         if (index < list.getLastIndex())
         {
             ySum
-                += DrawableBackground::hatStyle(DrawableList::Style::EntrySeperator)
+                += DrawableBackground::hasStyle(DrawableList::Style::EntrySeperator)
                      ? entrySeperatorSize
                      : 0;
             me.my
-                -= DrawableBackground::hatStyle(DrawableList::Style::EntrySeperator)
+                -= DrawableBackground::hasStyle(DrawableList::Style::EntrySeperator)
                      ? entrySeperatorSize
                      : 0;
         }
@@ -1069,20 +1069,20 @@ void DrawableList::doMouseEvent(MouseEvent& me, bool userRet)
     }
     me.my
         += ySum
-                 + (rahmen
-                     && DrawableBackground::hatStyle(TextField::Style::Border))
-             ? rahmen->getRBreite() * 2
+                 + (border
+                     && DrawableBackground::hasStyle(TextField::Style::Border))
+             ? border->getRWidth() * 2
              : 0;
-    me.mx += (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
-               ? rahmen->getRBreite() * 2
+    me.mx += (border && DrawableBackground::hasStyle(TextField::Style::Border))
+               ? border->getRWidth() * 2
                : 0;
-    if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
+    if (DrawableBackground::hasStyle(Style::VScroll) && vertikalScrollBar)
         me.my -= vertikalScrollBar->getScroll();
 }
 
 //! Adds an entry
 //! \param entry The drawing to add
-void DrawableList::addEintrag(Drawable* entry)
+void DrawableList::addEntry(Drawable* entry)
 {
     rend = 1;
     list.add(entry);
@@ -1091,7 +1091,7 @@ void DrawableList::addEintrag(Drawable* entry)
 //! Changes an entry
 //! \param pos The index of the entry
 //! \param entry The new drawing
-void DrawableList::setEintrag(int pos, Drawable* entry)
+void DrawableList::setEntry(int pos, Drawable* entry)
 {
     rend = 1;
     list.set(entry, pos);
@@ -1100,39 +1100,39 @@ void DrawableList::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 DrawableList::tauschEintragPos(int vPos, int nPos)
+void DrawableList::swapEntryPos(int vPos, int nPos)
 {
     rend = 1;
-    list.tausch(vPos, nPos);
+    list.swap(vPos, nPos);
 }
 
-void Framework::DrawableList::setEintragPos(int vpos, int npos)
+void Framework::DrawableList::setEntryPos(int vpos, int npos)
 {
     list.setPosition(vpos, npos);
 }
 
 //! Deletes an entry
 //! pos: The index of the entry
-void DrawableList::removeEintrag(int pos)
+void DrawableList::removeEntry(int pos)
 {
     rend = 1;
     list.remove(pos);
 }
 
 //! Scrolls to a specific entry
-//! \param eintrag The index of the entry
-void DrawableList::setVScrollZuEintrag(int eintrag)
+//! \param entry The index of the entry
+void DrawableList::setVScrollToEntry(int entry)
 {
     if (vertikalScrollBar)
     {
-        if (eintrag > list.getLastIndex()) eintrag = list.getLastIndex();
+        if (entry > list.getLastIndex()) entry = list.getLastIndex();
         int y = 0;
         int index = 0;
         for (Drawable* entry : list)
         {
             y += entry->getHeight();
             if (index < list.getLastIndex())
-                y += DrawableBackground::hatStyle(
+                y += DrawableBackground::hasStyle(
                          DrawableList::Style::EntrySeperator)
                        ? entrySeperatorSize
                        : 0;
@@ -1153,7 +1153,7 @@ void DrawableList::updateVScroll()
         {
             y += entry->getHeight();
             if (index < list.getLastIndex())
-                y += DrawableBackground::hatStyle(
+                y += DrawableBackground::hasStyle(
                          DrawableList::Style::EntrySeperator)
                        ? entrySeperatorSize
                        : 0;
@@ -1161,10 +1161,10 @@ void DrawableList::updateVScroll()
         }
         vertikalScrollBar->update(y,
             gr.y
-                - ((rahmen
-                       && DrawableBackground::hatStyle(
+                - ((border
+                       && DrawableBackground::hasStyle(
                            TextField::Style::Border))
-                        ? rahmen->getRBreite() * 2
+                        ? border->getRWidth() * 2
                         : 0));
     }
 }
@@ -1206,12 +1206,12 @@ void DrawableList::render(Image& rObj)
 {
     DrawableBackground::render(rObj);
     int index = 0;
-    int rbr = rahmen && DrawableBackground::hatStyle(TextField::Style::Border)
-                ? rahmen->getRBreite()
+    int rbr = border && DrawableBackground::hasStyle(TextField::Style::Border)
+                ? border->getRWidth()
                 : 0;
-    bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
-    if (rObj.setDrawOptions(pos + Punkt(rbr, rbr),
-            gr - Punkt(rbr, rbr) * 2 - Punkt(vs ? 15 : 0, 0)))
+    bool vs = vertikalScrollBar && hasStyle(Style::VScroll);
+    if (rObj.setDrawOptions(pos + Point(rbr, rbr),
+            gr - Point(rbr, rbr) * 2 - Point(vs ? 15 : 0, 0)))
     {
         if (vs) rObj.addScrollOffset(0, vertikalScrollBar->getScroll());
         for (Drawable* entry : list)
@@ -1220,12 +1220,12 @@ void DrawableList::render(Image& rObj)
             entry->render(rObj);
             rObj.addScrollOffset(0, -entry->getHeight());
             if (index < list.getLastIndex()
-                && DrawableBackground::hatStyle(
+                && DrawableBackground::hasStyle(
                     DrawableList::Style::EntrySeperator))
             {
                 for (int i = 0; i < entrySeperatorSize; i++)
                 {
-                    rObj.drawLinieHAlpha(
+                    rObj.drawLineHAlpha(
                         0, 0, gr.x - rbr - (vs ? 15 : 0), entrySeperatorColor);
                     rObj.addScrollOffset(0, -1);
                 }
@@ -1239,7 +1239,7 @@ void DrawableList::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 DrawableList::getKlickEintrag(int my)
+int DrawableList::getClickEntry(int my)
 {
     if (my < 0) return -1;
     int index = 0;
@@ -1249,7 +1249,7 @@ int DrawableList::getKlickEintrag(int my)
         if (my < y) return index;
         y += entry->getHeight();
         if (index < list.getLastIndex())
-            y += DrawableBackground::hatStyle(DrawableList::Style::EntrySeperator)
+            y += DrawableBackground::hasStyle(DrawableList::Style::EntrySeperator)
                    ? entrySeperatorSize
                    : 0;
         index++;
@@ -1265,7 +1265,7 @@ int DrawableList::getEntryCount() const
 
 //! Returns the index of an entry
 //! \param zEntry The drawing
-int DrawableList::getEintragPos(Drawable* zEntry)
+int DrawableList::getEntryPos(Drawable* zEntry)
 {
     int index = 0;
     for (Drawable* entry : list)
@@ -1278,14 +1278,14 @@ int DrawableList::getEintragPos(Drawable* zEntry)
 
 //! Returns an entry
 //! \param pos The index of the entry
-Drawable* DrawableList::getEintrag(int pos) const
+Drawable* DrawableList::getEntry(int pos) const
 {
     return list.get(pos);
 }
 
 //! Returns an entry without increased reference counter
 //! \param pos The index of the entry
-Drawable* DrawableList::zEintrag(int pos) const
+Drawable* DrawableList::zEntry(int pos) const
 {
     return list.get(pos);
 }
@@ -1293,15 +1293,15 @@ Drawable* DrawableList::zEintrag(int pos) const
 //! Returns the needed height
 int DrawableList::getNeededHeight() const
 {
-    int y = (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
-              ? rahmen->getRBreite() * 2
+    int y = (border && DrawableBackground::hasStyle(TextField::Style::Border))
+              ? border->getRWidth() * 2
               : 0;
     int index = 0;
     for (Drawable* entry : list)
     {
         y += entry->getHeight();
         if (index < list.getLastIndex())
-            y += DrawableBackground::hatStyle(DrawableList::Style::EntrySeperator)
+            y += DrawableBackground::hasStyle(DrawableList::Style::EntrySeperator)
                    ? entrySeperatorSize
                    : 0;
         index++;

List.h

@@ -28,23 +28,23 @@ namespace Framework
             //! Specifies whether the list entries have a border
             static const __int64 FieldBorder = 0x0001000;
             //! Specifies whether the entries have a background
-            static const __int64 FeldHintergrund = 0x0002000;
+            static const __int64 FieldBackground = 0x0002000;
             //! Specifies whether the entries have a background image
-            static const __int64 FeldHImage = 0x0004000;
+            static const __int64 FieldHImage = 0x0004000;
             //! Specifies whether alpha blending is used when drawing
             //! entry backgrounds
-            static const __int64 FeldHAlpha = 0x0008000;
+            static const __int64 FieldHAlpha = 0x0008000;
             //! Specifies whether the entries have a color gradient
-            static const __int64 FeldBuffer = 0x0010000;
+            static const __int64 FieldBuffer = 0x0010000;
             //! Specifies whether selected entries have a background
-            static const __int64 AuswahlHintergrund = 0x0020000;
+            static const __int64 SelectionBackground = 0x0020000;
             //! Specifies whether selected entries have a background image
-            static const __int64 AuswahlHImage = 0x0040000;
+            static const __int64 SelectionHImage = 0x0040000;
             //! Specifies whether alpha blending is used for drawing
             //! backgrounds of selected entries
-            static const __int64 AuswahlHAlpha = 0x0080000;
+            static const __int64 SelectionHAlpha = 0x0080000;
             //! Specifies whether selected entries have a color gradient
-            static const __int64 AuswahlBuffer = 0x0100000;
+            static const __int64 SelectionBuffer = 0x0100000;
             //! Specifies whether selected entries have a border
             static const __int64 SelectionBorder = 0x0200000;
             //! Specifies whether each entry has its own background,
@@ -56,30 +56,30 @@ namespace Framework
             //! MultiSelect was set.
             static const __int64 Selected = 0x1000000;
 
-            //! Combines the flags Sichtbar, Erlaubt, Border, FeldHAlpha,
-            //! FeldHintergrund, FieldBorder, AuswahlBuffer, SelectionBorder
+            //! Combines the flags Visible, Allowed, Border, FieldHAlpha,
+            //! FieldBackground, FieldBorder, SelectionBuffer, SelectionBorder
             static const __int64 Normal
-                = Sichtbar | Erlaubt | Border | FeldHAlpha | FeldHintergrund
-                | FieldBorder | AuswahlBuffer | SelectionBorder;
+                = Visible | Allowed | Border | FieldHAlpha | FieldBackground
+                | FieldBorder | SelectionBuffer | SelectionBorder;
         };
 
     private:
         RCArray<TextField>* tfListe;
-        int auswahl;
-        int ahFarbe;
+        int selection;
+        int ahColor;
         Image* ahImage;
         AlphaField* aBuffer;
         Border* aBorder;
         Array<__int64>* styles;
-        Array<int>* ahFarbeListe;
+        Array<int>* ahColorListe;
         RCArray<Image>* ahImageListe;
         RCArray<AlphaField>* aBufferListe;
         RCArray<Border>* aBorderList;
-        Font* schrift;
+        Font* font;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
         DLLEXPORT void doMouseEvent(MouseEvent& me, bool userRet) override;
-        DLLEXPORT bool hatStyle(int styleSet, int styleCheck) const;
+        DLLEXPORT bool hasStyle(int styleSet, int styleCheck) const;
 
     public:
         //! Constructor
@@ -90,65 +90,65 @@ namespace Framework
         DLLEXPORT void update();
         //! Adds an entry
         //! \param txt The text of the entry
-        DLLEXPORT void addEintrag(Text* txt);
+        DLLEXPORT void addEntry(Text* txt);
         //! Adds an entry
         //! \param txt The text of the entry
-        DLLEXPORT void addEintrag(const char* txt);
+        DLLEXPORT void addEntry(const char* txt);
         //! Adds a pointer to an entry
         //! \param tf The TextField used to draw the entry
-        DLLEXPORT void addEintragZ(TextField* tf);
+        DLLEXPORT void addEntryZ(TextField* tf);
         //! Adds an entry at a specific position
         //! \param pos The index of the new entry
         //! \param txt The text of the entry
-        DLLEXPORT void addEintrag(int pos, Text* txt);
+        DLLEXPORT void addEntry(int pos, Text* txt);
         //! Adds an entry at a specific position
         //! \param pos The index of the new entry
         //! \param txt The text of the entry
-        DLLEXPORT void addEintrag(int pos, const char* txt);
+        DLLEXPORT void addEntry(int pos, const char* txt);
         //! Adds a pointer to an entry at a specific position
         //! \param pos The index of the new entry \param tf The TextField
         //! used to draw the entry
-        DLLEXPORT void addEintragZ(int pos, TextField* tf);
+        DLLEXPORT void addEntryZ(int pos, TextField* tf);
         //! Changes an entry
         //! \param pos The index of the entry
         //! \param txt The new text of the entry
-        DLLEXPORT void setEintrag(int pos, Text* txt);
+        DLLEXPORT void setEntry(int pos, Text* txt);
         //! Changes an entry
         //! \param pos The index of the entry
         //! \param txt The new text of the entry
-        DLLEXPORT void setEintrag(int pos, const char* txt);
+        DLLEXPORT void setEntry(int pos, const char* txt);
         //! Changes the pointer of an entry
         //! \param pos The index of the entry
         //! \param tf The new entry
-        DLLEXPORT void setEintragZ(int pos, TextField* tf);
+        DLLEXPORT void setEntryZ(int pos, TextField* tf);
         //! Swaps the positions of two entries
         //! \param vpos The index of the first entry
         //! \param npos The index of the second entry
-        DLLEXPORT void tauschEintragPos(int vpos, int npos);
+        DLLEXPORT void swapEntryPos(int vpos, int npos);
         //! Sets the position of an entry
         //! \param vpos The index of the entry
         //! \param npos The index the entry should have
-        DLLEXPORT void setEintragPos(int vpos, int npos);
+        DLLEXPORT void setEntryPos(int vpos, int npos);
         //! Deletes an entry
         //! pos: The index of the entry
-        DLLEXPORT void removeEintrag(int pos);
+        DLLEXPORT void removeEntry(int pos);
         //! Sets the font to use
-        //! \param schrift The font
-        DLLEXPORT void setFontZ(Font* schrift);
+        //! \param font The font
+        DLLEXPORT void setFontZ(Font* font);
         //! Scrolls to a specific entry
-        //! \param eintrag The index of the entry
-        DLLEXPORT void setVScrollZuEintrag(int eintrag);
+        //! \param entry The index of the entry
+        DLLEXPORT void setVScrollToEntry(int entry);
         //! Updates the maximum scroll height by adding the heights of all entries
         DLLEXPORT void updateVScroll();
         //! Sets a pointer to the border used for selected entries
-        //! if MultiStyled is not set \param rahmen The border
-        DLLEXPORT void setALRZ(Border* rahmen);
+        //! if MultiStyled is not set \param border The border
+        DLLEXPORT void setALRZ(Border* border);
         //! Sets the width of the border used for selected entries
         //! if MultiStyled is not set \param br The width in pixels
-        DLLEXPORT void setALRBreite(int br);
+        DLLEXPORT void setALRWidth(int br);
         //! Sets the color of the border used for selected entries
         //! if MultiStyled is not set \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setALRFarbe(int fc);
+        DLLEXPORT void setALRColor(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(AlphaField* buffer);
@@ -157,7 +157,7 @@ namespace Framework
         DLLEXPORT void setAAFStrength(int st);
         //! Sets the color of the color gradient used for selected entries
         //! if MultiStyled is not set \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setAAFFarbe(int fc);
+        DLLEXPORT void setAAFColor(int fc);
         //! Sets the background image by copying, used for selected entries
         //! if MultiStyled is not set \param bild The image to copy
         DLLEXPORT void setAHImage(Image* bild);
@@ -166,19 +166,19 @@ namespace Framework
         DLLEXPORT void setAHImageZ(Image* bild);
         //! Sets the background color used for selected entries
         //! if MultiStyled is not set \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setAHFarbe(int fc);
+        DLLEXPORT void setAHColor(int fc);
         //! Sets a pointer to the border used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
-        //! \param rahmen The border
-        DLLEXPORT void setALRZ(int pos, Border* rahmen);
+        //! \param border The border
+        DLLEXPORT void setALRZ(int pos, Border* border);
         //! Sets the width of the border used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param br The width in pixels
-        DLLEXPORT void setALRBreite(int pos, int br);
+        DLLEXPORT void setALRWidth(int pos, int br);
         //! Sets the color of the border used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setALRFarbe(int pos, int fc);
+        DLLEXPORT void setALRColor(int pos, int fc);
         //! 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
@@ -190,7 +190,7 @@ namespace Framework
         //! Sets the color of the color gradient used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setAAFFarbe(int pos, int fc);
+        DLLEXPORT void setAAFColor(int pos, int fc);
         //! Sets the background image by copying, used for a selected entry
         //! if MultiStyled is set
         //! \param pos The index of the entry
@@ -204,7 +204,7 @@ namespace Framework
         //! Sets the background color used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setAHFarbe(int pos, int fc);
+        DLLEXPORT void setAHColor(int pos, int fc);
         //! Sets the style of an entry if MultiStyled is set, and specifies
         //! whether an entry is selected if MultiSelect is set
         //! \param pos The index of the entry \param style The new style
@@ -232,28 +232,28 @@ namespace Framework
         //! 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
-        DLLEXPORT int getKlickEintrag(int my);
+        DLLEXPORT int getClickEntry(int my);
         //! Selects an entry
-        //! \param ausw The index of the entry
-        DLLEXPORT void setAuswahl(int ausw);
+        //! \param sel The index of the entry
+        DLLEXPORT void setSelection(int sel);
         //! Deselects all selected entries
-        DLLEXPORT void deSelect();
+        DLLEXPORT void deselect();
         //! Returns the number of entries
         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,
+        //! checked with hasMsStyle( entry index,
         //! SelectionList::Style::Ausgewaehlt )
-        DLLEXPORT int getAuswahl() const;
+        DLLEXPORT int getSelection() const;
         //! Returns the index of an entry
-        //! \param eintragText The text of the entry
-        DLLEXPORT int getEintragPos(Text* eintragText);
+        //! \param entryText The text of the entry
+        DLLEXPORT int getEntryPos(Text* entryText);
         //! Returns an entry
         //! \param pos The index of the entry
-        DLLEXPORT TextField* getEintrag(int pos) const;
+        DLLEXPORT TextField* getEntry(int pos) const;
         //! Returns an entry without increased reference counter
         //! \param pos The index of the entry
-        DLLEXPORT TextField* zEintrag(int pos) const;
+        DLLEXPORT TextField* zEntry(int pos) const;
         //! Returns the border used for selected entries
         //! if MultiStyled is not set
         DLLEXPORT Border* getABorder() const;
@@ -262,7 +262,7 @@ namespace Framework
         DLLEXPORT Border* zABorder() const;
         //! Returns the background color in A8R8G8B8 format used for
         //! selected entries if MultiStyled is not set
-        DLLEXPORT int getAHFarbe() const;
+        DLLEXPORT int getAHColor() const;
         //! Returns the background image used for selected entries
         //! if MultiStyled is not set
         DLLEXPORT Image* getAHImage() const;
@@ -283,7 +283,7 @@ namespace Framework
         DLLEXPORT Border* zABorder(int pos) const;
         //! Returns the background color in A8R8G8B8 format used for a
         //! selected entry if MultiStyled is set
-        DLLEXPORT int getAHFarbe(int pos) const;
+        DLLEXPORT int getAHColor(int pos) const;
         //! Returns the background image used for a selected entry
         //! if MultiStyled is set
         DLLEXPORT Image* getAHImage(int pos) const;
@@ -300,13 +300,13 @@ namespace Framework
         //! if MultiStyled is set. Also checks whether an entry is selected
         //! if MultiSelect is set \param pos The index of the entry
         //! \param style The styles to check
-        DLLEXPORT inline bool hatMsStyle(int pos, __int64 style) const;
+        DLLEXPORT inline bool hasMsStyle(int pos, __int64 style) const;
         //! Checks whether specific styles are not set for a specific entry
         //! if MultiStyled is set. Also checks whether an entry is not selected
         //! if MultiSelect is set
         //! \param pos The index of the entry
         //! \param style The styles to check
-        DLLEXPORT inline bool hatMsStyleNicht(int pos, __int64 style) const;
+        DLLEXPORT inline bool hasMsStyleNot(int pos, __int64 style) const;
     };
 
     class DrawableList : public DrawableBackground
@@ -317,10 +317,10 @@ namespace Framework
         public:
             //! draws a seperation line between the entries
             static const __int64 EntrySeperator = 0x0001000;
-            //! Combines the flags Sichtbar, Erlaubt,
-            //! Border, Hintergrund
+            //! Combines the flags Visible, Allowed,
+            //! Border, Background
             static const __int64 Normal
-                = Sichtbar | Erlaubt | Border | Hintergrund | EntrySeperator;
+                = Visible | Allowed | Border | Background | EntrySeperator;
         };
 
     private:
@@ -340,25 +340,25 @@ namespace Framework
         DLLEXPORT virtual ~DrawableList();
         //! Adds an entry
         //! \param entry The drawing to add
-        DLLEXPORT void addEintrag(Drawable* entry);
+        DLLEXPORT void addEntry(Drawable* entry);
         //! Changes an entry
         //! \param pos The index of the entry
         //! \param entry The new drawing
-        DLLEXPORT void setEintrag(int pos, Drawable* entry);
+        DLLEXPORT void setEntry(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
-        DLLEXPORT void tauschEintragPos(int vpos, int npos);
+        DLLEXPORT void swapEntryPos(int vpos, int npos);
         //! Sets the position of an entry
         //! \param vpos The index of the entry
         //! \param npos The index the entry should have
-        DLLEXPORT void setEintragPos(int vpos, int npos);
+        DLLEXPORT void setEntryPos(int vpos, int npos);
         //! Deletes an entry
         //! pos: The index of the entry
-        DLLEXPORT void removeEintrag(int pos);
+        DLLEXPORT void removeEntry(int pos);
         //! Scrolls to a specific entry
-        //! \param eintrag The index of the entry
-        DLLEXPORT void setVScrollZuEintrag(int eintrag);
+        //! \param entry The index of the entry
+        DLLEXPORT void setVScrollToEntry(int entry);
         //! Updates the maximum scroll height by adding the heights of all entries
         DLLEXPORT void updateVScroll();
         //! sets the size of the entry seperator
@@ -379,18 +379,18 @@ namespace Framework
         //! 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
-        DLLEXPORT int getKlickEintrag(int my);
+        DLLEXPORT int getClickEntry(int my);
         //! Returns the number of entries
         DLLEXPORT int getEntryCount() const;
         //! Returns the index of an entry
         //! \param zEntry The drawing
-        DLLEXPORT int getEintragPos(Drawable* zEntry);
+        DLLEXPORT int getEntryPos(Drawable* zEntry);
         //! Returns an entry
         //! \param pos The index of the entry
-        DLLEXPORT Drawable* getEintrag(int pos) const;
+        DLLEXPORT Drawable* getEntry(int pos) const;
         //! Returns an entry without increased reference counter
         //! \param pos The index of the entry
-        DLLEXPORT Drawable* zEintrag(int pos) const;
+        DLLEXPORT Drawable* zEntry(int pos) const;
         //! Returns the needed height
         DLLEXPORT int getNeededHeight() const;
         //! returns the size of the entry seperator

Logging.cpp

@@ -603,20 +603,20 @@ Framework::Logging::FileLoggingChannel::FileLoggingChannel(File* file)
     : LoggingChannel(),
       file(file)
 {
-    if (!file->existiert())
+    if (!file->exists())
     {
-        file->erstellen();
+        file->create();
     }
-    if (!file->istOffen())
+    if (!file->isOpen())
     {
         file->open(
-            File::Style::schreiben | File::Style::ende | File::Style::lesen);
+            File::Style::schreiben | File::Style::ende | File::Style::readAll);
     }
 }
 
 Framework::Logging::FileLoggingChannel::~FileLoggingChannel()
 {
-    if (file->istOffen())
+    if (file->isOpen())
     {
         file->close();
     }
@@ -625,8 +625,8 @@ Framework::Logging::FileLoggingChannel::~FileLoggingChannel()
 
 void Framework::Logging::FileLoggingChannel::writeMessage(const Text& msg) const
 {
-    file->schreibe(msg.getText(), msg.getLength());
-    file->schreibe("\n", 1);
+    file->write(msg.getText(), msg.getLength());
+    file->write("\n", 1);
     file->flush();
 }
 

M2DPreview.cpp

@@ -32,25 +32,25 @@ M2DPreview::~M2DPreview()
 
 void M2DPreview::doMouseEvent(MouseEvent& me, bool userRet)
 {
-    if (hatStyleNicht(Style::Erlaubt) || !userRet) return;
-    if (hatStyle(Style::UsrScale))
+    if (hasStyleNot(Style::Allowed) || !userRet) return;
+    if (hasStyle(Style::UsrScale))
     {
         if (mdl && me.id == ME_UScroll) mdl->addSize(0.01f);
         if (mdl && me.id == ME_DScroll) mdl->addSize(-0.01f);
     }
-    if (me.id == ME_RLinks || me.id == ME_RRechts || me.id == ME_Leaves)
+    if (me.id == ME_RLeft || me.id == ME_RRight || me.id == ME_Leaves)
     {
         mx = -1;
         my = -1;
     }
-    if (mdl && me.id == ME_Bewegung)
+    if (mdl && me.id == ME_Move)
     {
         if (mx != -1 && my != -1)
         {
-            if (getMausStand(M_Links) && hatStyle(Style::UsrMove))
+            if (getMouseState(M_Left) && hasStyle(Style::UsrMove))
                 mdl->setPosition(
-                    mdl->getPosition() + Punkt(me.mx - mx, me.my - my));
-            if (getMausStand(M_Rechts) && hatStyle(Style::UsrRot))
+                    mdl->getPosition() + Point(me.mx - mx, me.my - my));
+            if (getMouseState(M_Right) && hasStyle(Style::UsrRot))
             {
                 if (me.mx > gr.x / 2)
                     mdl->addDrehung(0.01f * (float)(me.my - my));
@@ -65,12 +65,12 @@ void M2DPreview::doMouseEvent(MouseEvent& me, bool userRet)
             my = me.my;
         }
     }
-    if (me.id == ME_PLinks || me.id == ME_PRechts)
+    if (me.id == ME_PLeft || me.id == ME_PRight)
     {
         mx = me.mx;
         my = me.my;
     }
-    me.verarbeitet = 1;
+    me.processed = 1;
 }
 
 // non-constant
@@ -99,12 +99,12 @@ bool M2DPreview::tick(double tv)
 void M2DPreview::render(Image& rb)
 {
     removeStyle(Style::VScroll | Style::HScroll);
-    if (hatStyleNicht(Style::Sichtbar)) return;
+    if (hasStyleNot(Style::Visible)) return;
     DrawableBackground::render(rb);
     if (!rb.setDrawOptions(innenPosition, innenSize)) return;
     if (mdl)
     {
-        int rbr = rahmen && hatStyle(Style::Border) ? rahmen->getRBreite() : 0;
+        int rbr = border && hasStyle(Style::Border) ? border->getRWidth() : 0;
         rb.addScrollOffset(-gr.x / 2 + rbr, -gr.y / 2 + rbr);
         mdl->render(rb);
     }
@@ -122,13 +122,13 @@ Model2D* M2DPreview::getModel() const
     return mdl ? dynamic_cast<Model2D*>(mdl->getThis()) : 0;
 }
 
-Drawable* M2DPreview::dublizieren() const
+Drawable* M2DPreview::duplicate() const
 {
     M2DPreview* ret = new M2DPreview();
     if (mdl) ret->setModel2D(mdl->getModel());
-    if (rahmen) ret->setBorderZ((Border*)rahmen->dublizieren());
-    if (hintergrundFeld)
-        ret->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
-    ret->setHintergrundFarbe(bgF);
+    if (border) ret->setBorderZ((Border*)border->duplicate());
+    if (backgroundFeld)
+        ret->setAlphaFieldZ((AlphaField*)backgroundFeld->duplicate());
+    ret->setBackgroundColor(bgF);
     return ret;
 }

M2DPreview.h

@@ -64,6 +64,6 @@ namespace Framework
         DLLEXPORT Model2D* getModel() const;
         //! Creates a copy of the drawing that can be used without affecting the
         //! original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 } // namespace Framework

M2File.cpp

@@ -52,26 +52,26 @@ void M2File::setPfadZ(Text* pfad)
     this->pfad = pfad;
 }
 
-void M2File::leseDaten()
+void M2File::readData()
 {
     File d;
     d.setFile(pfad->getText());
-    d.open(File::Style::lesen);
+    d.open(File::Style::readAll);
     char anz = 0;
-    d.lese(&anz, 1);
-    modelName->leeren();
-    modelPos->leeren();
+    d.read(&anz, 1);
+    modelName->clear();
+    modelPos->clear();
     for (int i = 0; i < anz; i++)
     {
         char len = 0;
-        d.lese(&len, 1);
+        d.read(&len, 1);
         char* txt = new char[len + 1];
-        d.lese(txt, len);
+        d.read(txt, len);
         txt[(int)len] = 0;
         modelName->set(new Text(txt), i);
         delete[] txt;
         __int64 pos = 0;
-        d.lese((char*)&pos, 8);
+        d.read((char*)&pos, 8);
         modelPos->set(pos, i);
     }
     d.close();
@@ -89,7 +89,7 @@ bool M2File::saveModel(Model2DData* zMdr, const char* name)
     int anz = modelName->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
-        if (modelName->z(i)->istGleich(name))
+        if (modelName->z(i)->isEqual(name))
         {
             if (!removeModel(name)) return 0;
             break;
@@ -98,15 +98,15 @@ bool M2File::saveModel(Model2DData* zMdr, const char* name)
     anz = modelName->getEntryCount();
     File d;
     d.setFile(pfad->getText());
-    d.open(File::Style::lesen);
+    d.open(File::Style::readAll);
     File neu;
     neu.setFile(pfad->getText());
     neu.zPfad()->append("0");
-    while (neu.existiert())
+    while (neu.exists())
         neu.zPfad()->append("0");
     if (!neu.open(File::Style::schreiben))
     {
-        if (d.istOffen()) d.close();
+        if (d.isOpen()) d.close();
         return 0;
     }
     modelName->add(new Text(name));
@@ -119,16 +119,16 @@ bool M2File::saveModel(Model2DData* zMdr, const char* name)
         modelPos->add(d.getSize() + offs);
     anz++;
     char tmp = (char)anz;
-    neu.schreibe(&tmp, 1);
+    neu.write(&tmp, 1);
     for (int i = 0; i < anz; i++)
     {
         char len = (char)modelName->z(i)->getLength();
-        neu.schreibe(&len, 1);
-        neu.schreibe(modelName->z(i)->getText(), len);
+        neu.write(&len, 1);
+        neu.write(modelName->z(i)->getText(), len);
         __int64 pos = modelPos->get(i);
-        neu.schreibe((char*)&pos, 8);
+        neu.write((char*)&pos, 8);
     }
-    if (d.existiert())
+    if (d.exists())
     {
         d.setLPosition(modelPos->get(0) - offs, 0);
         __int64 dl = d.getSize() - d.getLPosition();
@@ -136,14 +136,14 @@ bool M2File::saveModel(Model2DData* zMdr, const char* name)
         while (dl)
         {
             int l = dl > 2048 ? 2048 : (int)dl;
-            d.lese(bytes, l);
-            neu.schreibe(bytes, l);
+            d.read(bytes, l);
+            neu.write(bytes, l);
             dl -= l;
         }
     }
     d.close();
     char pAnz = (char)zMdr->polygons->getEntryCount();
-    neu.schreibe(&pAnz, 1);
+    neu.write(&pAnz, 1);
     for (int p = 0; p < pAnz; p++)
     {
         char pNameL = (char)zMdr->polygons->get(p).name->getLength();
@@ -152,35 +152,35 @@ bool M2File::saveModel(Model2DData* zMdr, const char* name)
         for (int i = 0; i < vAnz; i++)
             options
                 = (char)(options
-                         & (char)zMdr->polygons->get(p).tKordinaten->hat(i));
+                         & (char)zMdr->polygons->get(p).tKordinaten->has(i));
         if (pNameL != 0) options |= 2;
         if (zMdr->polygons->get(p).transparent) options |= 4;
-        neu.schreibe(&options, 1);
+        neu.write(&options, 1);
         if ((options | 2) == options) // name
         {
-            neu.schreibe(&pNameL, 1);
-            neu.schreibe(zMdr->polygons->get(p).name->getText(), pNameL);
+            neu.write(&pNameL, 1);
+            neu.write(zMdr->polygons->get(p).name->getText(), pNameL);
         }
-        neu.schreibe((char*)&vAnz, 4);
+        neu.write((char*)&vAnz, 4);
         for (int i = 0; i < vAnz; i++)
         {
             float v = zMdr->polygons->get(p).vertex->get(i).x;
-            neu.schreibe((char*)&v, 4);
+            neu.write((char*)&v, 4);
             v = zMdr->polygons->get(p).vertex->get(i).y;
-            neu.schreibe((char*)&v, 4);
+            neu.write((char*)&v, 4);
             if ((options | 1) == options) // textur
             {
                 float t = zMdr->polygons->get(p).tKordinaten->get(i).x;
-                neu.schreibe((char*)&t, 4);
+                neu.write((char*)&t, 4);
                 t = zMdr->polygons->get(p).tKordinaten->get(i).y;
-                neu.schreibe((char*)&t, 4);
+                neu.write((char*)&t, 4);
             }
         }
     }
     d.remove();
     neu.close();
-    neu.umbenennen(pfad->getText());
-    leseDaten();
+    neu.rename(pfad->getText());
+    readData();
     return 1;
 }
 
@@ -197,7 +197,7 @@ bool M2File::removeModel(const char* name)
     int p = -1;
     for (int i = 0; i < anz; i++)
     {
-        if (modelName->z(i)->istGleich(name))
+        if (modelName->z(i)->isEqual(name))
         {
             p = i;
             break;
@@ -206,19 +206,19 @@ bool M2File::removeModel(const char* name)
     if (p < 0) return 0;
     File d;
     d.setFile(pfad->getText());
-    if (!d.open(File::Style::lesen)) return 0;
+    if (!d.open(File::Style::readAll)) return 0;
     File neu;
     neu.setFile(pfad->getText());
     neu.zPfad()->append("0");
-    while (neu.existiert())
+    while (neu.exists())
         neu.zPfad()->append("0");
     if (!neu.open(File::Style::schreiben))
     {
-        if (d.istOffen()) d.close();
+        if (d.isOpen()) d.close();
         return 0;
     }
     char nAnz = (char)(anz - 1);
-    neu.schreibe(&nAnz, 1);
+    neu.write(&nAnz, 1);
     int offs = modelName->z(p)->getLength() + 9;
     __int64 startP = 0, endP = 0, start2P = 0;
     for (int i = 0; i < anz; i++)
@@ -236,12 +236,12 @@ bool M2File::removeModel(const char* name)
         if (i != p)
         {
             pos -= offs;
-            neu.schreibe(&nLen, 1);
-            neu.schreibe(n, nLen);
-            neu.schreibe((char*)&pos, 8);
+            neu.write(&nLen, 1);
+            neu.write(n, nLen);
+            neu.write((char*)&pos, 8);
         }
     }
-    if (d.istOffen())
+    if (d.isOpen())
     {
         d.setLPosition(startP, 0);
         __int64 bLen = endP - startP;
@@ -249,8 +249,8 @@ bool M2File::removeModel(const char* name)
         while (bLen > 0)
         {
             int l = 2048 > bLen ? (int)bLen : 2048;
-            d.lese(bytes, l);
-            neu.schreibe(bytes, l);
+            d.read(bytes, l);
+            neu.write(bytes, l);
             bLen -= l;
         }
         if (start2P)
@@ -260,8 +260,8 @@ bool M2File::removeModel(const char* name)
             while (bLen > 0)
             {
                 int l = 2048 > bLen ? (int)bLen : 2048;
-                d.lese(bytes, l);
-                neu.schreibe(bytes, l);
+                d.read(bytes, l);
+                neu.write(bytes, l);
                 bLen -= l;
             }
         }
@@ -269,28 +269,28 @@ bool M2File::removeModel(const char* name)
     }
     d.remove();
     neu.close();
-    neu.umbenennen(pfad->getText());
-    leseDaten();
+    neu.rename(pfad->getText());
+    readData();
     return 1;
 }
 
 // constant
-Model2DData* M2File::ladeModel(Text* name) const
+Model2DData* M2File::loadModel(Text* name) const
 {
-    Model2DData* ret = ladeModel(name->getText());
+    Model2DData* ret = loadModel(name->getText());
     name->release();
     return ret;
 }
 
-Model2DData* M2File::ladeModel(const char* name) const
+Model2DData* M2File::loadModel(const char* name) const
 {
     File d;
     d.setFile(pfad->getText());
-    if (!d.open(File::Style::lesen)) return 0;
+    if (!d.open(File::Style::readAll)) return 0;
     int anz = modelName->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
-        if (modelName->z(i)->istGleich(name))
+        if (modelName->z(i)->isEqual(name))
         {
             d.setLPosition(modelPos->get(i), 0);
             break;
@@ -302,12 +302,12 @@ Model2DData* M2File::ladeModel(const char* name) const
         return 0;
     }
     char pAnz = 0;
-    d.lese(&pAnz, 1);
+    d.read(&pAnz, 1);
     Array<Polygon2D>* polygons = new Array<Polygon2D>();
     for (int p = 0; p < pAnz; p++)
     {
         char options = 0;
-        d.lese(&options, 1);
+        d.read(&options, 1);
         Polygon2D polygon;
         polygon.schwerpunkt = new Vertex(0, 0);
         polygon.transparent = (options | 4) == options;
@@ -315,16 +315,16 @@ Model2DData* M2File::ladeModel(const char* name) const
         if ((options | 2) == options)
         {
             char nameL = 0;
-            d.lese(&nameL, 1);
+            d.read(&nameL, 1);
             char* name = new char[nameL + 1];
             name[(int)nameL] = 0;
-            d.lese(name, nameL);
+            d.read(name, nameL);
             polygon.name->setText(name);
             delete[] name;
         }
         int vAnz = 0;
-        d.lese((char*)&vAnz, 4);
-        if (polygons->hat(p))
+        d.read((char*)&vAnz, 4);
+        if (polygons->has(p))
         {
             if (polygons->get(p).vertex) polygons->get(p).vertex->release();
             if (polygons->get(p).tKordinaten)
@@ -338,15 +338,15 @@ Model2DData* M2File::ladeModel(const char* name) const
         for (int v = 0; v < vAnz; v++)
         {
             Vertex p;
-            d.lese((char*)&p.x, 4);
-            d.lese((char*)&p.y, 4);
+            d.read((char*)&p.x, 4);
+            d.read((char*)&p.y, 4);
             *polygon.schwerpunkt += p * (float)(1.0 / vAnz);
             polygon.vertex->add(p);
             if ((options | 1) == options) // wenn textur
             {
                 Vertex tp;
-                d.lese((char*)&tp.x, 4);
-                d.lese((char*)&tp.y, 4);
+                d.read((char*)&tp.x, 4);
+                d.read((char*)&tp.y, 4);
                 polygon.tKordinaten->add(tp);
             }
         }
@@ -358,17 +358,17 @@ Model2DData* M2File::ladeModel(const char* name) const
     return ret;
 }
 
-bool M2File::hatModel(const char* name) const
+bool M2File::hasModel(const char* name) const
 {
     int anz = modelName->getEntryCount();
     for (int i = 0; i < anz; i++)
     {
-        if (modelName->z(i)->istGleich(name)) return 1;
+        if (modelName->z(i)->isEqual(name)) return 1;
     }
     return 0;
 }
 
-int M2File::getModelAnzahl() const
+int M2File::getModelCount() const
 {
     return modelName->getEntryCount();
 }

M2File.h

@@ -35,7 +35,7 @@ namespace Framework
         //! \param pfad Pointer to the path to the file
         DLLEXPORT void setPfadZ(Text* pfad);
         //! Reads basic information from the file needed for its usage
-        DLLEXPORT void leseDaten();
+        DLLEXPORT void readData();
         //! Saves 2D model data to the file
         //! \param zMdr A pointer to the data to save without increased
         //! reference counter \param name The name under which the data should
@@ -61,17 +61,17 @@ namespace Framework
         //! Loads a 2D model from the file
         //! \param name The name of the model to load
         //! \return The loaded data
-        DLLEXPORT Model2DData* ladeModel(Text* name) const;
+        DLLEXPORT Model2DData* loadModel(Text* name) const;
         //! Loads a 2D model from the file
         //! \param name The name of the model to load
         //! \return The loaded data
-        DLLEXPORT Model2DData* ladeModel(const char* name) const;
+        DLLEXPORT Model2DData* loadModel(const char* name) const;
         //! Checks whether a specific 2D model exists in the file
         //! \param name The name of the 2D model to search for
         //! \return 1 if the model was found. 0 otherwise
-        DLLEXPORT bool hatModel(const char* name) const;
+        DLLEXPORT bool hasModel(const char* name) const;
         //! Returns the number of stored models
-        DLLEXPORT int getModelAnzahl() const;
+        DLLEXPORT int getModelCount() const;
         //! Returns the name of a specific model
         //! \param i The index of the model
         //! \return A pointer to the name of the model without increased

M3File.cpp

@@ -41,23 +41,23 @@ M3File::~M3File()
 void M3File::saveKnochen(Bone* k, File* zDat)
 {
     bool c = k != 0;
-    zDat->schreibe((char*)&c, 1);
+    zDat->write((char*)&c, 1);
     if (c)
     {
         int id = k->getId();
-        zDat->schreibe((char*)&id, 4);
+        zDat->write((char*)&id, 4);
         float f = k->getPosition().x;
-        zDat->schreibe((char*)&f, 4);
+        zDat->write((char*)&f, 4);
         f = k->getPosition().y;
-        zDat->schreibe((char*)&f, 4);
+        zDat->write((char*)&f, 4);
         f = k->getPosition().z;
-        zDat->schreibe((char*)&f, 4);
+        zDat->write((char*)&f, 4);
         f = k->getRotation().x;
-        zDat->schreibe((char*)&f, 4);
+        zDat->write((char*)&f, 4);
         f = k->getRotation().y;
-        zDat->schreibe((char*)&f, 4);
+        zDat->write((char*)&f, 4);
         f = k->getRotation().z;
-        zDat->schreibe((char*)&f, 4);
+        zDat->write((char*)&f, 4);
         saveKnochen(k->zFirstSibling(), zDat);
         saveKnochen(k->zFirstChild(), zDat);
     }
@@ -66,21 +66,21 @@ void M3File::saveKnochen(Bone* k, File* zDat)
 Bone* Framework::M3File::readKnochen(File* zDat) const
 {
     bool c;
-    zDat->lese((char*)&c, 1);
+    zDat->read((char*)&c, 1);
     if (c)
     {
         int id;
-        zDat->lese((char*)&id, 4);
+        zDat->read((char*)&id, 4);
         Bone* k = new Bone(id);
         Vec3<float> pos;
-        zDat->lese((char*)&pos.x, 4);
-        zDat->lese((char*)&pos.y, 4);
-        zDat->lese((char*)&pos.z, 4);
+        zDat->read((char*)&pos.x, 4);
+        zDat->read((char*)&pos.y, 4);
+        zDat->read((char*)&pos.z, 4);
         k->setPosition(pos);
         Vec3<float> rot;
-        zDat->lese((char*)&rot.x, 4);
-        zDat->lese((char*)&rot.y, 4);
-        zDat->lese((char*)&rot.z, 4);
+        zDat->read((char*)&rot.x, 4);
+        zDat->read((char*)&rot.y, 4);
+        zDat->read((char*)&rot.z, 4);
         k->setRotation(rot);
         k->addSiblingBone(readKnochen(zDat));
         k->addChildBone(id, readKnochen(zDat));
@@ -99,7 +99,7 @@ void M3File::setPfad(const char* pfad)
 }
 
 // reads header information from the file needed for its usage.
-void M3File::leseDaten()
+void M3File::readData()
 {
     if (modelName) modelName = (RCArray<Text>*)modelName->release();
     if (modelPos) modelPos = (Array<__int64>*)modelPos->release();
@@ -107,20 +107,20 @@ void M3File::leseDaten()
     modelPos = new Array<__int64>();
     File d;
     d.setFile(pfad);
-    if (!d.open(File::Style::lesen)) return;
+    if (!d.open(File::Style::readAll)) return;
     unsigned char anz = 0;
-    d.lese((char*)&anz, 1);
+    d.read((char*)&anz, 1);
     for (int i = 0; i < anz; i++)
     {
         char len = 0;
-        d.lese(&len, 1);
+        d.read(&len, 1);
         char* n = new char[len + 1];
         n[(int)len] = 0;
-        d.lese(n, len);
+        d.read(n, len);
         modelName->add(new Text(n));
         delete[] n;
         __int64 p = 0;
-        d.lese((char*)&p, 8);
+        d.read((char*)&p, 8);
         modelPos->add(p);
     }
     d.close();
@@ -146,20 +146,20 @@ bool M3File::saveModel(Model3DData* zMdr, Text* name)
 bool M3File::saveModel(Model3DData* zMdr, const char* name)
 {
     if (!modelName || !pfad.getLength()) return 0;
-    if (hatModel(name) && !removeModel(name)) return 0;
+    if (hasModel(name) && !removeModel(name)) return 0;
     int anz = modelName->getEntryCount();
     anz = modelName->getEntryCount();
     File d;
     d.setFile(pfad);
-    d.open(File::Style::lesen);
+    d.open(File::Style::readAll);
     File neu;
     neu.setFile(pfad);
     neu.zPfad()->append("0");
-    while (neu.existiert())
+    while (neu.exists())
         neu.zPfad()->append("0");
     if (!neu.open(File::Style::schreiben))
     {
-        if (d.istOffen()) d.close();
+        if (d.isOpen()) d.close();
         return 0;
     }
     modelName->add(new Text(name));
@@ -172,16 +172,16 @@ bool M3File::saveModel(Model3DData* zMdr, const char* name)
         modelPos->add(d.getSize() + offs);
     anz++;
     char tmp = (char)anz;
-    neu.schreibe(&tmp, 1);
+    neu.write(&tmp, 1);
     for (int i = 0; i < anz; i++)
     {
         char len = (char)modelName->z(i)->getLength();
-        neu.schreibe(&len, 1);
-        neu.schreibe(modelName->z(i)->getText(), len);
+        neu.write(&len, 1);
+        neu.write(modelName->z(i)->getText(), len);
         __int64 pos = modelPos->get(i);
-        neu.schreibe((char*)&pos, 8);
+        neu.write((char*)&pos, 8);
     }
-    if (d.existiert())
+    if (d.exists())
     {
         d.setLPosition(modelPos->get(0) - offs, 0);
         __int64 dl = d.getSize() - d.getLPosition();
@@ -189,56 +189,56 @@ bool M3File::saveModel(Model3DData* zMdr, const char* name)
         while (dl)
         {
             int l = dl > 2048 ? 2048 : (int)dl;
-            d.lese(bytes, l);
-            neu.schreibe(bytes, l);
+            d.read(bytes, l);
+            neu.write(bytes, l);
             dl -= l;
         }
     }
     d.close();
-    int vAnz = zMdr->getVertexAnzahl();
-    neu.schreibe((char*)&vAnz, 4);
+    int vAnz = zMdr->getVertexCount();
+    neu.write((char*)&vAnz, 4);
     for (int i = 0; i < vAnz; i++)
     {
-        neu.schreibe((char*)&zMdr->zVertexBuffer()[i].knochenId, 4);
-        neu.schreibe((char*)&zMdr->zVertexBuffer()[i].pos.x, 4);
-        neu.schreibe((char*)&zMdr->zVertexBuffer()[i].pos.y, 4);
-        neu.schreibe((char*)&zMdr->zVertexBuffer()[i].pos.z, 4);
-        neu.schreibe((char*)&zMdr->zVertexBuffer()[i].tPos.x, 4);
-        neu.schreibe((char*)&zMdr->zVertexBuffer()[i].tPos.y, 4);
+        neu.write((char*)&zMdr->zVertexBuffer()[i].knochenId, 4);
+        neu.write((char*)&zMdr->zVertexBuffer()[i].pos.x, 4);
+        neu.write((char*)&zMdr->zVertexBuffer()[i].pos.y, 4);
+        neu.write((char*)&zMdr->zVertexBuffer()[i].pos.z, 4);
+        neu.write((char*)&zMdr->zVertexBuffer()[i].tPos.x, 4);
+        neu.write((char*)&zMdr->zVertexBuffer()[i].tPos.y, 4);
     }
-    int pAnz = zMdr->getPolygonAnzahl();
-    neu.schreibe((char*)&pAnz, 4);
+    int pAnz = zMdr->getPolygonCount();
+    neu.write((char*)&pAnz, 4);
     for (int p = 0; p < pAnz; p++)
     {
         Polygon3D* pol = zMdr->getPolygon(p);
         int anz = pol->indexAnz;
-        neu.schreibe((char*)&anz, 4);
-        neu.schreibe((char*)pol->indexList, anz * 4);
+        neu.write((char*)&anz, 4);
+        neu.write((char*)pol->indexList, anz * 4);
     }
     float factor = zMdr->getAmbientFactor();
-    neu.schreibe((char*)&factor, 4);
+    neu.write((char*)&factor, 4);
     factor = zMdr->getDiffusFactor();
-    neu.schreibe((char*)&factor, 4);
+    neu.write((char*)&factor, 4);
     factor = zMdr->getSpecularFactor();
-    neu.schreibe((char*)&factor, 4);
+    neu.write((char*)&factor, 4);
     Skeleton* skelet = zMdr->copySkelett();
     if (skelet)
     {
         bool b = 1;
-        neu.schreibe((char*)&b, 1);
+        neu.write((char*)&b, 1);
         int nId = skelet->getNextBoneId();
-        neu.schreibe((char*)&nId, 4);
+        neu.write((char*)&nId, 4);
         saveKnochen(skelet->zRootBone(), &neu);
         skelet->release();
     }
     else
     {
         bool b = 0;
-        neu.schreibe((char*)&b, 1);
+        neu.write((char*)&b, 1);
     }
     d.remove();
     neu.close();
-    neu.umbenennen(pfad);
+    neu.rename(pfad);
     return 1;
 }
 
@@ -260,15 +260,15 @@ bool M3File::removeModel(Text* name)
 bool M3File::removeModel(const char* name)
 {
     if (!modelName || !pfad.getLength()) return 0;
-    if (!hatModel(name)) return 0;
+    if (!hasModel(name)) return 0;
     File d;
     d.setFile(pfad);
-    if (!d.open(File::Style::lesen)) return 0;
+    if (!d.open(File::Style::readAll)) return 0;
     __int64 startPosition = modelPos->get(0);
     File neu;
     neu.setFile(pfad);
     neu.zPfad()->append("0");
-    while (neu.existiert())
+    while (neu.exists())
         neu.zPfad()->append("0");
     if (!neu.open(File::Style::schreiben))
     {
@@ -276,21 +276,21 @@ bool M3File::removeModel(const char* name)
         return 0;
     }
     char anz = (char)(modelName->getEntryCount() - 1);
-    neu.schreibe(&anz, 1);
+    neu.write(&anz, 1);
     __int64 offset = textLength(name) + 9;
     __int64 removedLength = 0;
     __int64 removedPosition = 0;
     int removedIndex = 0;
     for (int i = 0; i < anz + 1; i++)
     {
-        if (!modelName->z(i)->istGleich(name))
+        if (!modelName->z(i)->isEqual(name))
         {
             char len = (char)modelName->z(i)->getLength();
-            neu.schreibe(&len, 1);
-            neu.schreibe(modelName->z(i)->getText(), len);
+            neu.write(&len, 1);
+            neu.write(modelName->z(i)->getText(), len);
             modelPos->set(modelPos->get(i) - offset, i);
             __int64 pos = modelPos->get(i);
-            neu.schreibe((char*)&pos, 8);
+            neu.write((char*)&pos, 8);
         }
         else
         {
@@ -313,8 +313,8 @@ bool M3File::removeModel(const char* name)
     while (dl)
     {
         int l = dl > 2048 ? 2048 : (int)dl;
-        d.lese(bytes, l);
-        neu.schreibe(bytes, l);
+        d.read(bytes, l);
+        neu.write(bytes, l);
         dl -= l;
     }
     d.setLPosition(removedPosition + removedLength, 0);
@@ -322,14 +322,14 @@ bool M3File::removeModel(const char* name)
     while (dl)
     {
         int l = dl > 2048 ? 2048 : (int)dl;
-        d.lese(bytes, l);
-        neu.schreibe(bytes, l);
+        d.read(bytes, l);
+        neu.write(bytes, l);
         dl -= l;
     }
     d.close();
     d.remove();
     neu.close();
-    neu.umbenennen(pfad);
+    neu.rename(pfad);
     modelName->remove(removedIndex);
     modelPos->remove(removedIndex);
     return 1;
@@ -338,10 +338,10 @@ bool M3File::removeModel(const char* name)
 // Loads a 3D model from the file
 //  name: The name of the model to load
 //  return: The loaded data
-Model3DData* M3File::ladeModel(
+Model3DData* M3File::loadModel(
     Text* name, GraphicsApi* zApi, Text* uniqueName) const
 {
-    Model3DData* d = ladeModel(name->getText(), zApi, uniqueName->getText());
+    Model3DData* d = loadModel(name->getText(), zApi, uniqueName->getText());
     name->release();
     uniqueName->release();
     return d;
@@ -350,7 +350,7 @@ Model3DData* M3File::ladeModel(
 // Loads a 3D model from the file
 //  name: The name of the model to load
 //  return: The loaded data
-Model3DData* M3File::ladeModel(
+Model3DData* M3File::loadModel(
     const char* name, GraphicsApi* zApi, const char* uniqueName) const
 {
     if (!modelName || !pfad.getLength()) return 0;
@@ -358,7 +358,7 @@ Model3DData* M3File::ladeModel(
     auto p = modelPos->begin();
     for (auto n = modelName->begin(); n && p; n++, p++)
     {
-        if (n->istGleich(name))
+        if (n->isEqual(name))
         {
             pos = p;
             break;
@@ -368,7 +368,7 @@ Model3DData* M3File::ladeModel(
     {
         File d;
         d.setFile(pfad);
-        if (!d.open(File::Style::lesen))
+        if (!d.open(File::Style::readAll))
         {
             return 0;
         }
@@ -383,42 +383,42 @@ Model3DData* M3File::ladeModel(
             model = new Model3DData(0, 0, -1);
         }
         int vAnz;
-        d.lese((char*)&vAnz, 4);
+        d.read((char*)&vAnz, 4);
         Vertex3D* vertices = new Vertex3D[vAnz];
         for (int i = 0; i < vAnz; i++)
         {
-            d.lese((char*)&vertices[i].knochenId, 4);
-            d.lese((char*)&vertices[i].pos.x, 4);
-            d.lese((char*)&vertices[i].pos.y, 4);
-            d.lese((char*)&vertices[i].pos.z, 4);
-            d.lese((char*)&vertices[i].tPos.x, 4);
-            d.lese((char*)&vertices[i].tPos.y, 4);
+            d.read((char*)&vertices[i].knochenId, 4);
+            d.read((char*)&vertices[i].pos.x, 4);
+            d.read((char*)&vertices[i].pos.y, 4);
+            d.read((char*)&vertices[i].pos.z, 4);
+            d.read((char*)&vertices[i].tPos.x, 4);
+            d.read((char*)&vertices[i].tPos.y, 4);
         }
         model->setVertecies(vertices, vAnz);
         int pAnz;
-        d.lese((char*)&pAnz, 4);
+        d.read((char*)&pAnz, 4);
         for (int i = 0; i < pAnz; i++)
         {
             Polygon3D* p = new Polygon3D();
-            d.lese((char*)&p->indexAnz, 4);
+            d.read((char*)&p->indexAnz, 4);
             p->indexList = new int[p->indexAnz];
-            d.lese((char*)p->indexList, p->indexAnz * 4);
+            d.read((char*)p->indexList, p->indexAnz * 4);
             model->addPolygon(p);
         }
         float factor;
-        d.lese((char*)&factor, 4);
+        d.read((char*)&factor, 4);
         model->setAmbientFactor(factor);
-        d.lese((char*)&factor, 4);
+        d.read((char*)&factor, 4);
         model->setDiffusFactor(factor);
-        d.lese((char*)&factor, 4);
+        d.read((char*)&factor, 4);
         model->setSpecularFactor(factor);
         bool b;
-        d.lese((char*)&b, 1);
+        d.read((char*)&b, 1);
         if (b)
         {
             Skeleton* s = new Skeleton();
             int nId;
-            d.lese((char*)&nId, 4);
+            d.read((char*)&nId, 4);
             s->nextId = nId;
             s->rootBone = readKnochen(&d);
             model->setSkelettZ(s);
@@ -433,18 +433,18 @@ Model3DData* M3File::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 M3File::hatModel(const char* name) const
+bool M3File::hasModel(const char* name) const
 {
     if (!modelName || !pfad.getLength()) return 0;
     for (auto n = modelName->begin(); n; n++)
     {
-        if (n->istGleich(name)) return 1;
+        if (n->isEqual(name)) return 1;
     }
     return 0;
 }
 
 // Returns the number of stored models
-int M3File::getModelAnzahl() const
+int M3File::getModelCount() const
 {
     if (!modelName || !pfad.getLength()) return 0;
     return modelName->getEntryCount();

M3File.h

@@ -37,7 +37,7 @@ namespace Framework
         //! \param pfad Path to the file
         DLLEXPORT void setPfad(const char* pfad);
         //! Reads basic information from the file needed for its usage
-        DLLEXPORT void leseDaten();
+        DLLEXPORT void readData();
         //! Saves 3D model data to the file
         //! \param zMdr A pointer to the data to be saved without increased
         //! reference counter \param name The name under which the data should be
@@ -63,19 +63,19 @@ namespace Framework
         //! Loads a 3D model from the file
         //! \param name The name of the model to load
         //! \return The loaded data
-        DLLEXPORT Model3DData* ladeModel(
+        DLLEXPORT Model3DData* loadModel(
             Text* name, GraphicsApi* zApi, Text* uniqueName) const;
         //! Loads a 3D model from the file
         //! \param name The name of the model to load
         //! \return The loaded data
-        DLLEXPORT Model3DData* ladeModel(
+        DLLEXPORT Model3DData* loadModel(
             const char* name, GraphicsApi* zApi, const char* uniqueName) const;
         //! Checks whether a specific 3D model exists in the file
         //! \param name The name of the 3D model to search for
         //! \return 1 if the model was found. 0 otherwise
-        DLLEXPORT bool hatModel(const char* name) const;
+        DLLEXPORT bool hasModel(const char* name) const;
         //! Returns the number of stored models
-        DLLEXPORT int getModelAnzahl() const;
+        DLLEXPORT int getModelCount() const;
         //! Returns the name of a specific model
         //! \param i The index of the model
         //! \return A pointer to the name of the model without increased reference

Model2D.cpp

@@ -39,7 +39,7 @@ Model2DData::~Model2DData()
 }
 
 // privat
-bool Model2DData::istPunktInnen(Vertex p, int polygonId) const
+bool Model2DData::isPointInside(Vertex p, int polygonId) const
 {
     if (p < minP || p > maxP || !polygons) return 0;
     int num = 0;
@@ -53,7 +53,7 @@ bool Model2DData::istPunktInnen(Vertex p, int polygonId) const
         int j = anz - 1;
         for (auto outListPP = outListP->begin(); outListPP; outListPP++)
         {
-            Punkt out = outListPP;
+            Point out = outListPP;
             if (out.x < out.y && j > out.x && j < out.y) j = out.x;
             if (out.x > out.y && (j > out.x || j < out.y)) j = out.x;
         }
@@ -63,7 +63,7 @@ bool Model2DData::istPunktInnen(Vertex p, int polygonId) const
             bool cont = 0;
             for (auto outListPP = outListP->begin(); outListPP; outListPP++)
             {
-                Punkt out = outListPP;
+                Point out = outListPP;
                 if (out.x < out.y && i > out.x && i < out.y) cont = 1;
                 if (out.x > out.y && (i > out.x || i < out.y)) cont = 1;
             }
@@ -81,7 +81,7 @@ bool Model2DData::istPunktInnen(Vertex p, int polygonId) const
     return 0;
 }
 
-bool Model2DData::istLinieInnen(Vertex a, Vertex b, int polygonId) const
+bool Model2DData::isLineInside(Vertex a, Vertex b, int polygonId) const
 {
     if (!polygons) return 0;
     int pAnz = polygons->getEntryCount();
@@ -93,7 +93,7 @@ bool Model2DData::istLinieInnen(Vertex a, Vertex b, int polygonId) const
         int j = anz - 1;
         for (int k = 0; k < ola; k++)
         {
-            Punkt out = outList.z(p)->get(k);
+            Point out = outList.z(p)->get(k);
             if (out.x < out.y && j > out.x && j < out.y) j = out.x;
             if (out.x > out.y && (j > out.x || j < out.y)) j = out.x;
         }
@@ -102,15 +102,15 @@ bool Model2DData::istLinieInnen(Vertex a, Vertex b, int polygonId) const
             bool cont = 0;
             for (int k = 0; k < ola; k++)
             {
-                Punkt out = outList.z(p)->get(k);
+                Point out = outList.z(p)->get(k);
                 if (out.x < out.y && i > out.x && i < out.y) cont = 1;
                 if (out.x > out.y && (i > out.x || i < out.y)) cont = 1;
             }
             if (cont) continue;
-            Punkt va = polygons->get(p).vertex->get(i);
-            Punkt vb = polygons->get(p).vertex->get(j);
-            if ((Punkt)a == va && (Punkt)b == vb) return 1;
-            if ((Punkt)a == vb && (Punkt)b == va) return 1;
+            Point va = polygons->get(p).vertex->get(i);
+            Point vb = polygons->get(p).vertex->get(j);
+            if ((Point)a == va && (Point)b == vb) return 1;
+            if ((Point)a == vb && (Point)b == va) return 1;
             j = i;
         }
         Vertex len = b - a;
@@ -129,9 +129,9 @@ bool Model2DData::istLinieInnen(Vertex a, Vertex b, int polygonId) const
         int i = 1;
         bool inside = 1;
         for (Vertex vp = speed + a;
-            (Punkt)vp != (Punkt)(b - speed) && inside && i < mLen - 1;
+            (Point)vp != (Point)(b - speed) && inside && i < mLen - 1;
             vp += speed, i++)
-            inside &= istPunktInnen(vp, p);
+            inside &= isPointInside(vp, p);
         if (inside) return 1;
     }
     return 0;
@@ -155,11 +155,11 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
         Polygon2D pg = polygons->get(p);
         if (!pg.vertex || pg.vertex->getEntryCount() < 3) continue;
         vListen->add(new RCArray<TriangleList<Vertex>>());
-        outList.add(new Array<Punkt>);
+        outList.add(new Array<Point>);
         int vAnz = pg.vertex->getEntryCount();
         bool textur = pg.tKordinaten != 0;
         for (int i = 0; i < vAnz && textur; i++)
-            textur &= pg.tKordinaten->hat(i);
+            textur &= pg.tKordinaten->has(i);
         for (int i = 0; i < vAnz; i++)
         {
             if ((float)maxP.x < fabs(pg.vertex->get(i).x))
@@ -176,18 +176,18 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
         minP = -maxP;
         if (!textur)
         {
-            if (pg.tKordinaten) pg.tKordinaten->leeren();
+            if (pg.tKordinaten) pg.tKordinaten->clear();
         }
         RCArray<RCArray<TriangleList<Vertex>>> lists;
         int lauf = 0;
         while (1)
         {
             lists.add(new RCArray<TriangleList<Vertex>>());
-            outList.z(p)->add(Punkt(0, 0));
+            outList.z(p)->add(Point(0, 0));
             bool fertig = 0;
             Vertex a;
             Vertex b;
-            Array<Punkt> tmpOutList;
+            Array<Point> tmpOutList;
             for (int i = 0; i < vAnz; i++)
             {
                 bool cont = 0;
@@ -198,7 +198,7 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                 int ola = outList.z(p)->getEntryCount();
                 for (int j = 0; j < ola; j++)
                 {
-                    Punkt out = outList.z(p)->get(j);
+                    Point out = outList.z(p)->get(j);
                     if (out.x < out.y)
                     {
                         if (nachher > out.x && nachher < out.y) nachher = out.y;
@@ -221,18 +221,18 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                     b = pg.vertex->get(nachher - vAnz + 1);
                 else
                     b = pg.vertex->get(nachher);
-                if (istLinieInnen(a, b, p))
+                if (isLineInside(a, b, p))
                 {
                     TriangleList<Vertex>* lowL = new TriangleList<Vertex>();
                     TriangleList<Vertex>* heightL = new TriangleList<Vertex>();
-                    lowL->addPunkt(new Vertex(pg.vertex->get(i)),
+                    lowL->addPoint(new Vertex(pg.vertex->get(i)),
                         textur ? new Vertex(pg.tKordinaten->get(i)) : 0);
-                    heightL->addPunkt(new Vertex(pg.vertex->get(i)),
+                    heightL->addPoint(new Vertex(pg.vertex->get(i)),
                         textur ? new Vertex(pg.tKordinaten->get(i)) : 0);
                     int height = i + 1;
                     int low = i - 1;
-                    Punkt outL(0, 0);
-                    Punkt outH(0, 0);
+                    Point outL(0, 0);
+                    Point outH(0, 0);
                     for (int k = 0; k < 2; k++)
                     {
                         bool lowp = !k;
@@ -242,7 +242,7 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                             if (low < 0) low = vAnz - 1;
                             for (int j = 0; j <= lauf; j++)
                             {
-                                Punkt out = outList.z(p)->get(j);
+                                Point out = outList.z(p)->get(j);
                                 if (out.x < out.y)
                                 {
                                     if (height > out.x && height < out.y)
@@ -261,37 +261,37 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                             if (low == height)
                             {
                                 fertig = 1;
-                                outList.z(p)->set(Punkt(0, 0), lauf);
+                                outList.z(p)->set(Point(0, 0), lauf);
                                 if (!k)
-                                    lowL->addPunkt(new Vertex(b),
+                                    lowL->addPoint(new Vertex(b),
                                         textur ? new Vertex(
                                                      pg.tKordinaten->get(low))
                                                : 0);
                                 else
-                                    heightL->addPunkt(new Vertex(b),
+                                    heightL->addPoint(new Vertex(b),
                                         textur ? new Vertex(
                                                      pg.tKordinaten->get(low))
                                                : 0);
                                 break;
                             }
-                            bool inside = istLinieInnen(a, b, p);
+                            bool inside = isLineInside(a, b, p);
                             if (inside)
                             {
                                 if (!k)
-                                    outL = Punkt(low, height);
+                                    outL = Point(low, height);
                                 else
-                                    outH = Punkt(low, height);
-                                outList.z(p)->set(Punkt(low, height), lauf);
+                                    outH = Point(low, height);
+                                outList.z(p)->set(Point(low, height), lauf);
                             }
                             if (lowp)
                             {
                                 if (!k)
-                                    lowL->addPunkt(new Vertex(b),
+                                    lowL->addPoint(new Vertex(b),
                                         textur ? new Vertex(
                                                      pg.tKordinaten->get(low))
                                                : 0);
                                 else
-                                    heightL->addPunkt(new Vertex(b),
+                                    heightL->addPoint(new Vertex(b),
                                         textur ? new Vertex(
                                                      pg.tKordinaten->get(low))
                                                : 0);
@@ -300,12 +300,12 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                             else
                             {
                                 if (!k)
-                                    lowL->addPunkt(new Vertex(a),
+                                    lowL->addPoint(new Vertex(a),
                                         textur ? new Vertex(pg.tKordinaten->get(
                                                      height))
                                                : 0);
                                 else
-                                    heightL->addPunkt(new Vertex(a),
+                                    heightL->addPoint(new Vertex(a),
                                         textur ? new Vertex(pg.tKordinaten->get(
                                                      height))
                                                : 0);
@@ -316,13 +316,13 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
                             {
                                 height = i + 1;
                                 low = i - 1;
-                                outList.z(p)->set(Punkt(0, 0), lauf);
+                                outList.z(p)->set(Point(0, 0), lauf);
                                 break;
                             }
                         }
                         if (fertig) break;
                     }
-                    if (lowL->getDreieckAnzahl() > heightL->getDreieckAnzahl())
+                    if (lowL->getTriangleCount() > heightL->getTriangleCount())
                     {
                         lists.z(lauf)->add(lowL);
                         tmpOutList.add(outL);
@@ -343,10 +343,10 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
             int max = 0;
             for (int i = 0; i < vAnz; i++)
             {
-                if (lists.z(lauf)->hat(i)
-                    && lists.z(lauf)->z(i)->getDreieckAnzahl() > max)
+                if (lists.z(lauf)->has(i)
+                    && lists.z(lauf)->z(i)->getTriangleCount() > max)
                 {
-                    max = lists.z(lauf)->z(i)->getDreieckAnzahl();
+                    max = lists.z(lauf)->z(i)->getTriangleCount();
                     maxP = i;
                 }
             }
@@ -356,7 +356,7 @@ bool Model2DData::erstelleModell(Array<Polygon2D>* polygons)
             if (fertig) break;
             lauf++;
         }
-        outList.z(p)->leeren();
+        outList.z(p)->clear();
     }
     return 1;
 }
@@ -379,9 +379,9 @@ void Model2DData::removeModell() // resets the vertex data
     }
     if (vListen)
         vListen = (RCArray<RCArray<TriangleList<Vertex>>>*)vListen->release();
-    outList.leeren();
-    minP = Punkt(0, 0);
-    maxP = Punkt(0, 0);
+    outList.clear();
+    minP = Point(0, 0);
+    maxP = Point(0, 0);
 }
 
 bool Model2DData::calcHitPoint(Vertex pos,
@@ -395,7 +395,7 @@ bool Model2DData::calcHitPoint(Vertex pos,
     bool ret = 0;
     for (const Polygon2D& polygon : *polygons)
     {
-        if (polygon.name->istGleich(polygonName))
+        if (polygon.name->isEqual(polygonName))
         {
             int anz = polygon.vertex->getEntryCount();
             for (int i = 0; i < anz; i++)
@@ -459,8 +459,8 @@ bool Model2DData::split(Vertex pos,
     char* polygonName,
     Polygon2D& partA,
     Polygon2D& partB,
-    Punkt& posA,
-    Punkt& posB,
+    Point& posA,
+    Point& posB,
     std::function<double()> random) const
 {
     Vertex originalDir = dir;
@@ -468,9 +468,9 @@ bool Model2DData::split(Vertex pos,
     int num = 0;
     for (const Polygon2D& polygon : *polygons)
     {
-        if (polygon.name->istGleich(polygonName))
+        if (polygon.name->isEqual(polygonName))
         {
-            while (istPunktInnen(pos, num))
+            while (isPointInside(pos, num))
             {
                 pos -= dir;
             }
@@ -548,7 +548,7 @@ bool Model2DData::split(Vertex pos,
                         = texturSP
                         + Vertex(dir.x * txtChpPix.x, dir.y * txtChpPix.y);
                     ret = 0;
-                    bool needOne = !istPunktInnen(next);
+                    bool needOne = !isPointInside(next);
                     int bestI = -1;
                     float bo1 = 1000;
                     float bo2 = 1000;
@@ -659,8 +659,8 @@ bool Model2DData::split(Vertex pos,
                 partB.tKordinaten->add(polygon.tKordinaten->get(rightI));
                 *partA.schwerpunkt /= (float)partA.vertex->getEntryCount();
                 *partB.schwerpunkt /= (float)partB.vertex->getEntryCount();
-                posA = (Punkt)*partA.schwerpunkt;
-                posB = (Punkt)*partB.schwerpunkt;
+                posA = (Point)*partA.schwerpunkt;
+                posB = (Point)*partB.schwerpunkt;
                 for (int i = 0; i < partA.vertex->getEntryCount(); i++)
                     partA.vertex->set(
                         partA.vertex->get(i) - *partA.schwerpunkt, i);
@@ -725,7 +725,7 @@ void Model2DObject::setTexture(Texture2D* t)
 {
     if (rData)
     {
-        textur->leeren();
+        textur->clear();
         for (int i = 0; i < rData->polygons->getEntryCount(); i++)
             textur->add(dynamic_cast<Texture2D*>(t->getThis()));
     }
@@ -775,7 +775,7 @@ void Model2DObject::setTexture(Texture2D* t, const char* polygonName)
     int index = 0;
     for (const Polygon2D& i : *rData->polygons)
     {
-        if (i.name->istGleich(polygonName))
+        if (i.name->isEqual(polygonName))
             textur->set(dynamic_cast<Texture2D*>(t->getThis()), index);
         index++;
     }
@@ -790,7 +790,7 @@ void Model2DObject::render(
     for (auto p : *rData->vListen)
     {
         Mat3<float> mat = kamMat * getObjectMatrix();
-        if (textur->hat(num))
+        if (textur->has(num))
         {
             Image* txt = textur->z(num)->zTexture();
             for (auto i = p->begin(); i && txt; i++)
@@ -802,15 +802,15 @@ void Model2DObject::render(
                     Vertex a = mat * *j->punkt;
                     Vertex b = mat * *j.next()->punkt;
                     Vertex c = mat * *j.next().next()->punkt;
-                    Punkt ta = (Punkt)Vertex(
-                        j->textur->x * (float)(txt->getBreite() - 1),
+                    Point ta = (Point)Vertex(
+                        j->textur->x * (float)(txt->getWidth() - 1),
                         j->textur->y * (float)(txt->getHeight() - 1));
-                    Punkt tb = (Punkt)Vertex(
-                        j.next()->textur->x * (float)(txt->getBreite() - 1),
+                    Point tb = (Point)Vertex(
+                        j.next()->textur->x * (float)(txt->getWidth() - 1),
                         j.next()->textur->y * (float)(txt->getHeight() - 1));
-                    Punkt tc
-                        = (Punkt)Vertex(j.next().next()->textur->x
-                                            * (float)(txt->getBreite() - 1),
+                    Point tc
+                        = (Point)Vertex(j.next().next()->textur->x
+                                            * (float)(txt->getWidth() - 1),
                             j.next().next()->textur->y
                                 * (float)(txt->getHeight() - 1));
                     zRObj.drawTriangleTextureAlpha(a, b, c, ta, tb, tc, *txt);
@@ -832,9 +832,9 @@ void Model2DObject::render(
                 Vertex a = mat * *j->var->punkt;
                 Vertex b = mat * *j->next->var->punkt;
                 Vertex c = mat * *j->next->next->var->punkt;
-                zRObj.drawLinie( a, b, 0xFFFFFFFF );
-                zRObj.drawLinie( a, c, 0xFFFFFFFF );
-                zRObj.drawLinie( b, c, 0xFFFFFFFF );
+                zRObj.drawLine( a, b, 0xFFFFFFFF );
+                zRObj.drawLine( a, c, 0xFFFFFFFF );
+                zRObj.drawLine( b, c, 0xFFFFFFFF );
             }
         }
     }
@@ -842,7 +842,7 @@ void Model2DObject::render(
 }
 
 // constant
-bool Model2DObject::istPunktInnen(Vertex p, bool ignoreTransparent) const
+bool Model2DObject::isPointInside(Vertex p, bool ignoreTransparent) const
 {
     if (!rData) return 0;
     p -= position;
@@ -874,7 +874,7 @@ bool Model2DObject::istPunktInnen(Vertex p, bool ignoreTransparent) const
     return 0;
 }
 
-bool Model2DObject::istLinieInnen(
+bool Model2DObject::isLineInside(
     Vertex a, Vertex b, bool ignoreTransparent) const
 {
     if (!rData || !rData->polygons) return 0;
@@ -888,11 +888,11 @@ bool Model2DObject::istLinieInnen(
         int j = anz - 1;
         for (int i = 0; i < anz; i++)
         {
-            Punkt va = mat * rData->polygons->get(p).vertex->get(i);
-            Punkt vb = mat * rData->polygons->get(p).vertex->get(j);
-            if ((Punkt)a == position + va && (Punkt)b == position + vb)
+            Point va = mat * rData->polygons->get(p).vertex->get(i);
+            Point vb = mat * rData->polygons->get(p).vertex->get(j);
+            if ((Point)a == position + va && (Point)b == position + vb)
                 return 1;
-            if ((Punkt)a == position + vb && (Punkt)b == position + va)
+            if ((Point)a == position + vb && (Point)b == position + va)
                 return 1;
             j = i;
         }
@@ -912,15 +912,15 @@ bool Model2DObject::istLinieInnen(
         int i = 1;
         bool inside = 1;
         for (Vertex vp = speed + a;
-            (Punkt)vp != (Punkt)(b - speed) && inside && i < mLen - 1;
+            (Point)vp != (Point)(b - speed) && inside && i < mLen - 1;
             vp += speed, i++)
-            inside &= istPunktInnen(vp, ignoreTransparent);
+            inside &= isPointInside(vp, ignoreTransparent);
         if (inside) return 1;
     }
     return 0;
 }
 
-bool Model2DObject::istModelInnen(
+bool Model2DObject::isModelInside(
     const Object2D* zObj, Vertex* sp, bool end, bool ignoreTransparent) const
 {
     if (!end)
@@ -934,7 +934,7 @@ bool Model2DObject::istModelInnen(
         int anz = polygon.vertex->getEntryCount();
         for (int i = 0; i < anz; i++)
         {
-            if (zObj->istPunktInnen(
+            if (zObj->isPointInside(
                     mat * polygon.vertex->get(i), ignoreTransparent))
             {
                 if (sp) *sp = mat * polygon.vertex->get(i);
@@ -943,7 +943,7 @@ bool Model2DObject::istModelInnen(
         }
     }
     if (end) return 0;
-    return zObj->istModelInnen(this, sp, 1, ignoreTransparent);
+    return zObj->isModelInside(this, sp, 1, ignoreTransparent);
 }
 
 Rect2<float> Model2DObject::getBoundingBox() const
@@ -1030,7 +1030,7 @@ Texture2D* Model2DObject::getTexture(const char* polygonName) const
     int index = 0;
     for (const Polygon2D& p : *rData->polygons)
     {
-        if (p.name->istGleich(polygonName)) return textur->get(index);
+        if (p.name->isEqual(polygonName)) return textur->get(index);
         index++;
     }
     return 0;
@@ -1049,7 +1049,7 @@ Texture2D* Model2DObject::zTexture(const char* polygonName) const
     int index = 0;
     for (const Polygon2D& p : *rData->polygons)
     {
-        if (p.name->istGleich(polygonName)) return textur->z(index);
+        if (p.name->isEqual(polygonName)) return textur->z(index);
         index++;
     }
     return 0;
@@ -1070,7 +1070,7 @@ Model2DData* Model2DObject::zModel() const
 Model2D::Model2D()
     : Drawable()
 {
-    farbe = 0;
+    color = 0;
     style = 0;
     rData = 0;
     drehung = 0;
@@ -1139,16 +1139,16 @@ void Model2D::setTexture(Texture2D* t, const char* polygonName)
     int index = 0;
     for (const Polygon2D& p : *rData->polygons)
     {
-        if (p.name->istGleich(polygonName))
+        if (p.name->isEqual(polygonName))
             textur->set(dynamic_cast<Texture2D*>(t->getThis()), index);
         index++;
     }
     t->release();
 }
 
-void Model2D::setFarbe(int f)
+void Model2D::setColor(int f)
 {
-    farbe = f;
+    color = f;
     rend = 1;
 }
 
@@ -1159,7 +1159,7 @@ bool Model2D::tick(double tickVal)
 
 void Model2D::render(Image& zRObj)
 {
-    if (!rData || hatStyleNicht(Model2D::Style::Sichtbar) || !rData->polygons)
+    if (!rData || hasStyleNot(Model2D::Style::Visible) || !rData->polygons)
         return;
     Drawable::render(zRObj);
     int num = 0;
@@ -1168,7 +1168,7 @@ void Model2D::render(Image& zRObj)
         Mat3<float> mat = Mat3<float>::translation(pos)
                         * Mat3<float>::rotation(drehung)
                         * Mat3<float>::scaling(size);
-        if (hatStyle(Model2D::Style::Texture))
+        if (hasStyle(Model2D::Style::Texture))
         {
             if (!textur || !textur->z(num) || !textur->z(num)->zTexture()
                 || !rData->polygons->get(num).tKordinaten)
@@ -1182,10 +1182,10 @@ void Model2D::render(Image& zRObj)
                         Vertex a = mat * *j->punkt;
                         Vertex b = mat * *j.next()->punkt;
                         Vertex c = mat * *j.next().next()->punkt;
-                        if (hatStyle(Model2D::Style::Alpha))
-                            zRObj.drawDreieckAlpha(a, b, c, farbe);
+                        if (hasStyle(Model2D::Style::Alpha))
+                            zRObj.drawTriangleAlpha(a, b, c, color);
                         else
-                            zRObj.drawDreieck(a, b, c, farbe);
+                            zRObj.drawTriangle(a, b, c, color);
                     }
                 }
             }
@@ -1201,28 +1201,28 @@ void Model2D::render(Image& zRObj)
                         Vertex a = mat * *j->punkt;
                         Vertex b = mat * *j.next()->punkt;
                         Vertex c = mat * *j.next().next()->punkt;
-                        Punkt ta = (Punkt)Vertex(
-                            j->textur->x * (float)(txt->getBreite() - 1),
+                        Point ta = (Point)Vertex(
+                            j->textur->x * (float)(txt->getWidth() - 1),
                             j->textur->y * (float)(txt->getHeight() - 1));
-                        Punkt tb = (Punkt)Vertex(
-                            j.next()->textur->x * (float)(txt->getBreite() - 1),
+                        Point tb = (Point)Vertex(
+                            j.next()->textur->x * (float)(txt->getWidth() - 1),
                             j.next()->textur->y
                                 * (float)(txt->getHeight() - 1));
-                        Punkt tc
-                            = (Punkt)Vertex(j.next().next()->textur->x
-                                                * (float)(txt->getBreite() - 1),
+                        Point tc
+                            = (Point)Vertex(j.next().next()->textur->x
+                                                * (float)(txt->getWidth() - 1),
                                 j.next().next()->textur->y
                                     * (float)(txt->getHeight() - 1));
-                        if (hatStyle(Model2D::Style::Alpha))
+                        if (hasStyle(Model2D::Style::Alpha))
                             zRObj.drawTriangleTextureAlpha(
                                 a, b, c, ta, tb, tc, *txt);
                         else
-                            zRObj.drawDreieckTextur(a, b, c, ta, tb, tc, *txt);
+                            zRObj.drawTriangleTexture(a, b, c, ta, tb, tc, *txt);
                     }
                 }
             }
         }
-        if (hatStyle(Model2D::Style::Mesh))
+        if (hasStyle(Model2D::Style::Mesh))
         {
             for (auto i : *p)
             {
@@ -1233,22 +1233,22 @@ void Model2D::render(Image& zRObj)
                     Vertex a = mat * *j->punkt;
                     Vertex b = mat * *j.next()->punkt;
                     Vertex c = mat * *j.next().next()->punkt;
-                    if (hatStyle(Model2D::Style::Alpha))
+                    if (hasStyle(Model2D::Style::Alpha))
                     {
-                        zRObj.drawLinieAlpha(a, b, farbe);
-                        zRObj.drawLinieAlpha(b, c, farbe);
-                        zRObj.drawLinieAlpha(c, a, farbe);
+                        zRObj.drawLineAlpha(a, b, color);
+                        zRObj.drawLineAlpha(b, c, color);
+                        zRObj.drawLineAlpha(c, a, color);
                     }
                     else
                     {
-                        zRObj.drawLinie(a, b, farbe);
-                        zRObj.drawLinie(b, c, farbe);
-                        zRObj.drawLinie(c, a, farbe);
+                        zRObj.drawLine(a, b, color);
+                        zRObj.drawLine(b, c, color);
+                        zRObj.drawLine(c, a, color);
                     }
                 }
             }
         }
-        if (hatStyle(Model2D::Style::Border))
+        if (hasStyle(Model2D::Style::Border))
         {
             auto beg = rData->polygons->get(num).vertex->begin();
             if (beg)
@@ -1256,19 +1256,19 @@ void Model2D::render(Image& zRObj)
                 Vertex letzter;
                 for (auto e = beg; e && e.hasNext(); e++)
                 {
-                    if (hatStyle(Model2D::Style::Alpha))
-                        zRObj.drawLinieAlpha(
-                            mat * e._, mat * e.next()._, farbe);
+                    if (hasStyle(Model2D::Style::Alpha))
+                        zRObj.drawLineAlpha(
+                            mat * e._, mat * e.next()._, color);
                     else
-                        zRObj.drawLinie(mat * e._, mat * e.next()._, farbe);
+                        zRObj.drawLine(mat * e._, mat * e.next()._, color);
                     letzter = e.next();
                 }
                 if (beg.hasNext())
                 {
-                    if (hatStyle(Model2D::Style::Alpha))
-                        zRObj.drawLinieAlpha(mat * letzter, mat * beg._, farbe);
+                    if (hasStyle(Model2D::Style::Alpha))
+                        zRObj.drawLineAlpha(mat * letzter, mat * beg._, color);
                     else
-                        zRObj.drawLinie(mat * letzter, mat * beg._, farbe);
+                        zRObj.drawLine(mat * letzter, mat * beg._, color);
                 }
             }
         }
@@ -1289,12 +1289,12 @@ float Model2D::getSize() const
 
 // Returns whether a point is contained in the model
 //  p: The point
-bool Model2D::istPunktInnen(int x, int y) const
+bool Model2D::isPointInside(int x, int y) const
 {
-    return istPunktInnen(Vertex((float)x, (float)y));
+    return isPointInside(Vertex((float)x, (float)y));
 }
 
-bool Model2D::istPunktInnen(Vertex p) const
+bool Model2D::isPointInside(Vertex p) const
 {
     if (!rData) return 0;
     p -= pos;
@@ -1324,7 +1324,7 @@ bool Model2D::istPunktInnen(Vertex p) const
     return 0;
 }
 
-bool Model2D::istLinieInnen(Vertex a, Vertex b) const
+bool Model2D::isLineInside(Vertex a, Vertex b) const
 {
     if (!rData || !rData->polygons) return 0;
     int pAnz = rData->polygons->getEntryCount();
@@ -1337,10 +1337,10 @@ bool Model2D::istLinieInnen(Vertex a, Vertex b) const
         int j = anz - 1;
         for (int i = 0; i < anz; i++)
         {
-            Punkt va = mat * rData->polygons->get(p).vertex->get(i);
-            Punkt vb = mat * rData->polygons->get(p).vertex->get(j);
-            if ((Punkt)a == pos + va && (Punkt)b == pos + vb) return 1;
-            if ((Punkt)a == pos + vb && (Punkt)b == pos + va) return 1;
+            Point va = mat * rData->polygons->get(p).vertex->get(i);
+            Point vb = mat * rData->polygons->get(p).vertex->get(j);
+            if ((Point)a == pos + va && (Point)b == pos + vb) return 1;
+            if ((Point)a == pos + vb && (Point)b == pos + va) return 1;
             j = i;
         }
         Vertex len = b - a;
@@ -1359,15 +1359,15 @@ bool Model2D::istLinieInnen(Vertex a, Vertex b) const
         int i = 1;
         bool inside = 1;
         for (Vertex vp = speed + a;
-            (Punkt)vp != (Punkt)(b - speed) && inside && i < mLen - 1;
+            (Point)vp != (Point)(b - speed) && inside && i < mLen - 1;
             vp += speed, i++)
-            inside &= istPunktInnen(vp);
+            inside &= isPointInside(vp);
         if (inside) return 1;
     }
     return 0;
 }
 
-bool Model2D::istModelInnen(const Model2D* zMdl, bool end) const
+bool Model2D::isModelInside(const Model2D* zMdl, bool end) const
 {
     if (!end)
     {
@@ -1390,11 +1390,11 @@ bool Model2D::istModelInnen(const Model2D* zMdl, bool end) const
         int anz = polygon.vertex->getEntryCount();
         for (int i = 0; i < anz; i++)
         {
-            if (zMdl->istPunktInnen(mat * polygon.vertex->get(i))) return 1;
+            if (zMdl->isPointInside(mat * polygon.vertex->get(i))) return 1;
         }
     }
     if (end) return 0;
-    return zMdl->istModelInnen(this, 1);
+    return zMdl->isModelInside(this, 1);
 }
 
 Model2DData* Model2D::getModel() const

Model2D.h

@@ -29,21 +29,21 @@ namespace Framework
     class Model2DData : public virtual ReferenceCounter
     {
     private:
-        RCArray<Array<Punkt>> outList;
+        RCArray<Array<Point>> outList;
 
         //! Checks whether a point is inside the model
         //! \param p The point
         //! \param polygonId The ID of the polygon to check
-        bool istPunktInnen(Vertex p, int polygonId = -1) const;
+        bool isPointInside(Vertex p, int polygonId = -1) const;
         //! Checks whether a line is inside the model
         //! \param a The start point of the line
         //! \param b The end point of the line
-        bool istLinieInnen(Vertex a, Vertex b, int polygonId = -1) const;
+        bool isLineInside(Vertex a, Vertex b, int polygonId = -1) const;
 
     public:
         Array<Polygon2D>* polygons;
         RCArray<RCArray<TriangleList<Vertex>>>* vListen;
-        Punkt minP, maxP;
+        Point minP, maxP;
 
         //! Constructor
         __declspec(dllexport) Model2DData();
@@ -84,8 +84,8 @@ namespace Framework
             char* polygonName,
             Polygon2D& partA,
             Polygon2D& partB,
-            Punkt& posA,
-            Punkt& posB,
+            Point& posA,
+            Point& posB,
             std::function<double()> random) const;
         //! Returns the mass of the 2D model (sum of the areas of the
         //! non-transparent polygons)
@@ -124,14 +124,14 @@ namespace Framework
         //! \param p The point
         //! \param ignoreTransparentFlag if 1, collisions with transparent
         //! polygons are also considered
-        __declspec(dllexport) bool istPunktInnen(
+        __declspec(dllexport) bool isPointInside(
             Vertex p, bool ignoreTransparent = 0) const override;
         //! Checks whether a line is inside the model
         //! \param a The start point of the line
         //! \param b The end point of the line
         //! \param ignoreTransparentFlag if 1, collisions with transparent
         //! polygons are also considered
-        __declspec(dllexport) bool istLinieInnen(
+        __declspec(dllexport) bool isLineInside(
             Vertex a, Vertex b, bool ignoreTransparent = 0) const override;
         //! Checks whether the object intersects with another
         //! \param zObj A pointer to the other object without increased reference
@@ -140,7 +140,7 @@ namespace Framework
         //! checked. 1 if only the points of this model should be searched
         //! in the other \param ignoreTransparentFlag if 1, collisions with
         //! transparent polygons are also considered
-        __declspec(dllexport) virtual bool istModelInnen(const Object2D* zObj,
+        __declspec(dllexport) virtual bool isModelInside(const Object2D* zObj,
             Vertex* sp = 0,
             bool end = 0,
             bool ignoreTransparent = 0) const;
@@ -195,7 +195,7 @@ namespace Framework
         Model2DData* rData;
         float drehung;
         float size;
-        int farbe;
+        int color;
         RCArray<Texture2D>* textur;
 
     public:
@@ -228,7 +228,7 @@ namespace Framework
             Texture2D* t, const char* polygonName);
         //! Sets the color
         //! \param f The color in A8R8G8B8 format
-        __declspec(dllexport) void setFarbe(int f);
+        __declspec(dllexport) void setColor(int f);
         //! Processes the time elapsed since the last call of this function
         //! \param tickVal The elapsed time in seconds
         __declspec(dllexport) bool tick(double tickVal) override;
@@ -241,19 +241,19 @@ namespace Framework
         __declspec(dllexport) float getSize() const;
         //! Returns whether a point is inside the model
         //! \param p The point
-        __declspec(dllexport) bool istPunktInnen(int x, int y) const override;
+        __declspec(dllexport) bool isPointInside(int x, int y) const override;
         //! Returns whether a point is inside the model
         //! \param p The point
-        __declspec(dllexport) bool istPunktInnen(Vertex p) const;
+        __declspec(dllexport) bool isPointInside(Vertex p) const;
         //! Checks whether a line is inside the model
         //! \param a The start point of the line
         //! \param b The end point of the line
-        __declspec(dllexport) bool istLinieInnen(Vertex a, Vertex b) const;
+        __declspec(dllexport) bool isLineInside(Vertex a, Vertex b) const;
         //! Checks whether the model intersects with another
         //! \param zMdl A pointer to the other model without increased reference
         //! counter \param end 0 if all corners of both models should be checked.
         //! 1 if only the points of this model should be searched in the other
-        __declspec(dllexport) bool istModelInnen(
+        __declspec(dllexport) bool isModelInside(
             const Model2D* zMdl, bool end = 0) const;
         //! Returns the model data
         __declspec(dllexport) Model2DData* getModel() const;

Model3D.cpp

@@ -347,8 +347,8 @@ Model3DData::~Model3DData()
 // updates the DX Buffer gpu memory if changed
 DLLEXPORT void Model3DData::updateGPUMemory()
 {
-    dxIndexBuffer->copieren();
-    dxVertexBuffer->copieren();
+    dxIndexBuffer->copyData();
+    dxVertexBuffer->copyData();
 }
 
 // Deletes all model data
@@ -359,7 +359,7 @@ void Model3DData::clearModel()
     vertexList = 0;
     for (Polygon3D* i : *polygons)
         delete i;
-    polygons->leeren();
+    polygons->clear();
     if (skelett) skelett->release();
     skelett = 0;
     radius = 0;
@@ -545,7 +545,7 @@ void Model3DData::copyModel2D(Model2DData* model, float z)
 //  index: The index of the polygon
 void Model3DData::removePolygon(int index)
 {
-    if (!polygons->hat(index)) return;
+    if (!polygons->has(index)) return;
     delete polygons->get(index);
     polygons->remove(index);
     buildIndexBuffer();
@@ -568,7 +568,7 @@ int Model3DData::kalkulateMatrix(const Mat4<float>& modelMatrix,
 }
 
 // Returns the number of polygons
-int Model3DData::getPolygonAnzahl() const
+int Model3DData::getPolygonCount() const
 {
     return polygons->getEntryCount();
 }
@@ -577,7 +577,7 @@ int Model3DData::getPolygonAnzahl() const
 //  index: The index of the polygon
 Polygon3D* Model3DData::getPolygon(int index) const
 {
-    if (!polygons->hat(index)) return 0;
+    if (!polygons->has(index)) return 0;
     return polygons->get(index);
 }
 
@@ -625,7 +625,7 @@ Skeleton* Model3DData::copySkelett() const
 }
 
 // Returns the number of vertices
-int Model3DData::getVertexAnzahl() const
+int Model3DData::getVertexCount() const
 {
     return vertexCount;
 }
@@ -745,7 +745,7 @@ Model3D::~Model3D()
 
 // Sets the model data
 //  data: The data
-void Model3D::setModelDaten(Model3DData* data)
+void Model3D::setModelData(Model3DData* data)
 {
     if (model) model->release();
     if (skelett) skelett = (Skeleton*)skelett->release();
@@ -792,7 +792,7 @@ void Framework::Model3D::setSpecularFactor(float f)
 //  viewProj: The multiplied camera matrices
 //  matBuffer: An array of matrices to be filled
 //  return: The number of matrices the model requires
-int Model3D::errechneMatrizen(
+int Model3D::calculateMatrices(
     const Mat4<float>& viewProj, Mat4<float>* matBuffer)
 {
     int ret = 0;
@@ -800,7 +800,7 @@ int Model3D::errechneMatrizen(
         ret = skelett->calculateMatrix(welt, matBuffer, size, viewProj);
     else if (model)
         ret = model->kalkulateMatrix(welt, matBuffer, size, viewProj);
-    if (!ret) return Drawable3D::errechneMatrizen(viewProj, matBuffer);
+    if (!ret) return Drawable3D::calculateMatrices(viewProj, matBuffer);
     return ret;
 }
 
@@ -974,7 +974,7 @@ int Model3D::traceRay(
                     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)
+                            (int)(ht.x * ((float)tex->getWidth() - 1.f)
                                   + 0.5f),
                             (int)(ht.y * ((float)tex->getHeight() - 1.f)
                                   + 0.5f));
@@ -989,7 +989,7 @@ int Model3D::traceRay(
 
 // Returns the id of the data if registered in a Model3DList
 // (see Framework::zM3DRegister())
-int Model3D::getDatenId() const
+int Model3D::getDataId() const
 {
     return model ? model->getId() : -1;
 }
@@ -1013,9 +1013,9 @@ float Model3D::getSpecularFactor() const
 }
 
 // Returns the number of vertices
-int Model3D::getVertexAnzahl() const
+int Model3D::getVertexCount() const
 {
-    return model ? model->getVertexAnzahl() : 0;
+    return model ? model->getVertexCount() : 0;
 }
 
 // Returns a buffer with all vertices of the model

Model3D.h

@@ -228,7 +228,7 @@ namespace Framework
             float scaleFactor,
             const Mat4<float>& kamMatrix) const;
         //! Returns the number of polygons
-        DLLEXPORT int getPolygonAnzahl() const;
+        DLLEXPORT int getPolygonCount() const;
         //! Returns a specific polygon
         //! \param index The index of the polygon
         DLLEXPORT Polygon3D* getPolygon(int index) const;
@@ -251,7 +251,7 @@ namespace Framework
         //! Returns a copy of the skeleton that can be used for animations
         DLLEXPORT Skeleton* copySkelett() const;
         //! Returns the number of vertices
-        DLLEXPORT int getVertexAnzahl() const;
+        DLLEXPORT int getVertexCount() const;
         //! Returns a buffer with all vertices of the model
         DLLEXPORT const Vertex3D* zVertexBuffer() const;
         //! Returns a reference to the start of the index buffer
@@ -308,7 +308,7 @@ namespace Framework
         DLLEXPORT virtual ~Model3D();
         //! Sets the model data
         //! \param data The data
-        DLLEXPORT void setModelDaten(Model3DData* data);
+        DLLEXPORT void setModelData(Model3DData* data);
         //! Sets the textures to use for drawing
         //! \param txt A list of textures assigned to the different polygons
         DLLEXPORT void setModelTextur(Model3DTexture* txt);
@@ -328,7 +328,7 @@ namespace Framework
         //! \param viewProj The multiplied camera matrices
         //! \param matBuffer An array of matrices to fill
         //! \return The number of matrices the model requires
-        DLLEXPORT int errechneMatrizen(
+        DLLEXPORT int calculateMatrices(
             const Mat4<float>& viewProj, Mat4<float>* matBuffer) override;
         //! Processes elapsed time
         //! \param tickval The time in seconds since the last call of this
@@ -367,7 +367,7 @@ namespace Framework
             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;
+        DLLEXPORT int getDataId() const;
         //! Returns the factor by which ambient light (texture color)
         //! is multiplied
         DLLEXPORT float getAmbientFactor() const;
@@ -378,7 +378,7 @@ namespace Framework
         //! is multiplied
         DLLEXPORT float getSpecularFactor() const;
         //! Returns the number of vertices
-        DLLEXPORT int getVertexAnzahl() const;
+        DLLEXPORT int getVertexCount() const;
         //! Returns a buffer with all vertices of the model
         DLLEXPORT const Vertex3D* zVertexBuffer() const;
         //! Returns true if a specific polygon needs to be drawn

Model3DList.cpp

@@ -31,7 +31,7 @@ bool Model3DList::addModel(Model3DData* mdl, const char* name)
 {
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             mdl->release();
             return 0;
@@ -49,7 +49,7 @@ void Model3DList::removeModel(const char* name)
     int index = 0;
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             names->remove(index);
             models->remove(index);
@@ -62,11 +62,11 @@ void Model3DList::removeModel(const char* name)
 // Checks whether a model has been stored under a specific name
 //  name: The name
 //  return: true if a model with the name exists
-bool Model3DList::hatModel(const char* name) const
+bool Model3DList::hasModel(const char* name) const
 {
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             return 1;
         }
@@ -81,7 +81,7 @@ Model3DData* Model3DList::getModel(const char* name) const
     int index = 0;
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             return models->get(index);
         }
@@ -97,7 +97,7 @@ Model3DData* Model3DList::zModel(const char* name) const
     int index = 0;
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             return models->z(index);
         }
@@ -109,6 +109,6 @@ Model3DData* Model3DList::zModel(const char* name) const
 //! remove All models
 DLLEXPORT void Model3DList::removeAll()
 {
-    models->leeren();
-    names->leeren();
+    models->clear();
+    names->clear();
 }

Model3DList.h

@@ -38,7 +38,7 @@ namespace Framework
         DLLEXPORT void removeModel(const char* name);
         //! Checks whether a model is stored under a specific name
         //! \param name The name \return true if a model with the name exists
-        DLLEXPORT bool hatModel(const char* name) const;
+        DLLEXPORT bool hasModel(const char* name) const;
         //! Returns a specific model
         //! \param name The name of the model
         DLLEXPORT Model3DData* getModel(const char* name) const;

Mouse.cpp

@@ -9,27 +9,27 @@ using namespace Framework;
 // Constructor
 Mouse::Mouse()
     : ReferenceCounter(),
-      hMaus(LoadCursor(0, IDC_ARROW))
+      hMouse(LoadCursor(0, IDC_ARROW))
 {}
 
 // non-constant
-void Mouse::loadMouse(int mausId)
+void Mouse::loadMouse(int mouseId)
 {
-    if (mausId == MausId::nichts) hMaus = 0;
-    if (mausId == MausId::normal) hMaus = LoadCursor(0, IDC_ARROW);
-    if (mausId == MausId::hand) hMaus = LoadCursor(0, IDC_HAND);
-    if (mausId == MausId::warten) hMaus = LoadCursor(0, IDC_APPSTARTING);
-    if (mausId == MausId::verschieben) hMaus = LoadCursor(0, IDC_SIZEALL);
-    if (mausId == MausId::text) hMaus = LoadCursor(0, IDC_IBEAM);
-    if (mausId == MausId::wahgerecht) hMaus = LoadCursor(0, IDC_SIZEWE);
-    if (mausId == MausId::senkrecht) hMaus = LoadCursor(0, IDC_SIZENS);
-    if (mausId == MausId::diagonal1) hMaus = LoadCursor(0, IDC_SIZENWSE);
-    if (mausId == MausId::diagonal2) hMaus = LoadCursor(0, IDC_SIZENESW);
-    if (mausId == MausId::verboten) hMaus = LoadCursor(0, IDC_NO);
-    SetCursor(hMaus);
+    if (mouseId == MouseId::nichts) hMouse = 0;
+    if (mouseId == MouseId::normal) hMouse = LoadCursor(0, IDC_ARROW);
+    if (mouseId == MouseId::hand) hMouse = LoadCursor(0, IDC_HAND);
+    if (mouseId == MouseId::warten) hMouse = LoadCursor(0, IDC_APPSTARTING);
+    if (mouseId == MouseId::verschieben) hMouse = LoadCursor(0, IDC_SIZEALL);
+    if (mouseId == MouseId::text) hMouse = LoadCursor(0, IDC_IBEAM);
+    if (mouseId == MouseId::wahgerecht) hMouse = LoadCursor(0, IDC_SIZEWE);
+    if (mouseId == MouseId::senkrecht) hMouse = LoadCursor(0, IDC_SIZENS);
+    if (mouseId == MouseId::diagonal1) hMouse = LoadCursor(0, IDC_SIZENWSE);
+    if (mouseId == MouseId::diagonal2) hMouse = LoadCursor(0, IDC_SIZENESW);
+    if (mouseId == MouseId::verboten) hMouse = LoadCursor(0, IDC_NO);
+    SetCursor(hMouse);
 }
 
-void Mouse::loadMouse(Image* maus)
+void Mouse::loadMouse(Image* mouse)
 {
     HBITMAP hAndMaskBitmap;
     HBITMAP hXorMaskBitmap;
@@ -38,9 +38,9 @@ void Mouse::loadMouse(Image* maus)
     HDC hXorMaskDC = CreateCompatibleDC(hDC);
 
     hAndMaskBitmap
-        = CreateCompatibleBitmap(hDC, maus->getBreite(), maus->getHeight());
+        = CreateCompatibleBitmap(hDC, mouse->getWidth(), mouse->getHeight());
     hXorMaskBitmap
-        = CreateCompatibleBitmap(hDC, maus->getBreite(), maus->getHeight());
+        = CreateCompatibleBitmap(hDC, mouse->getWidth(), mouse->getHeight());
 
     // Select the bitmaps to DC
     HBITMAP hOldAndMaskBitmap
@@ -50,11 +50,11 @@ void Mouse::loadMouse(Image* maus)
 
     // Scan each pixel of the souce bitmap and create the masks
     int y;
-    for (int x = 0; x < maus->getBreite(); ++x)
+    for (int x = 0; x < mouse->getWidth(); ++x)
     {
-        for (y = 0; y < maus->getHeight(); ++y)
+        for (y = 0; y < mouse->getHeight(); ++y)
         {
-            int pixel = maus->getPixel(x, y);
+            int pixel = mouse->getPixel(x, y);
             if (((pixel >> 24) & 0xFF) == 0)
             {
                 SetPixel(hAndMaskDC, x, y, RGB(255, 255, 255));
@@ -85,18 +85,18 @@ void Mouse::loadMouse(Image* maus)
     iconinfo.yHotspot = 0;
     iconinfo.hbmMask = hAndMaskBitmap;
     iconinfo.hbmColor = hXorMaskBitmap;
-    hMaus = CreateIconIndirect(&iconinfo);
+    hMouse = CreateIconIndirect(&iconinfo);
 
-    SetCursor(hMaus);
+    SetCursor(hMouse);
 }
 
 void Mouse::update()
 {
-    SetCursor(hMaus);
+    SetCursor(hMouse);
 }
 
 // constant
 HCURSOR Mouse::getMouseHandle()
 {
-    return hMaus;
+    return hMouse;
 }

Mouse.h

@@ -9,7 +9,7 @@ namespace Framework
     class Image; //! from Image.h
     class Mouse; //! from this file
 
-    namespace MausId
+    namespace MouseId
     {
         const int nichts = 0;
         const int normal = 1;
@@ -22,7 +22,7 @@ namespace Framework
         const int diagonal1 = 8;
         const int diagonal2 = 9;
         const int verboten = 10;
-    } // namespace MausId
+    } // namespace MouseId
 
     //! This class manages the mouse cursor image.
     //! It is used internally by the framework.
@@ -30,18 +30,18 @@ namespace Framework
     class Mouse : public virtual ReferenceCounter
     {
     private:
-        HCURSOR hMaus;
+        HCURSOR hMouse;
 
     public:
         //! Constructor
         DLLEXPORT Mouse();
         //! Loads a mouse cursor from Windows
-        //! \param mausId Values from the MausId namespace
-        //! Example: loadMouse( MausId::hand );
-        DLLEXPORT void loadMouse(int mausId);
+        //! \param mouseId Values from the MouseId namespace
+        //! Example: loadMouse( MouseId::hand );
+        DLLEXPORT void loadMouse(int mouseId);
         //! Copies an image and uses it as mouse cursor.
-        //! \param maus The image to use as mouse cursor
-        DLLEXPORT void loadMouse(Image* maus);
+        //! \param mouse The image to use as mouse cursor
+        DLLEXPORT void loadMouse(Image* mouse);
         //! Updates the mouse. Called by the framework itself
         DLLEXPORT void update();
         //! returns a handle to the mouse cursor.

MouseEvent.cpp

@@ -11,7 +11,7 @@ bool Framework::_ret1ME(void* param, void* obj, MouseEvent me)
 
 bool Framework::_closeWindowME(void* param, void* obj, MouseEvent me)
 {
-    if (me.id == ME_RLinks)
-        ((Window*)obj)->removeStyle(Window::Style::Sichtbar);
+    if (me.id == ME_RLeft)
+        ((Window*)obj)->removeStyle(Window::Style::Visible);
     return 1;
 }

MouseEvent.h

@@ -1,5 +1,5 @@
-#ifndef MausEreignis_H
-#define MausEreignis_H
+#ifndef MouseEreignis_H
+#define MouseEreignis_H
 
 #include <functional>
 
@@ -7,21 +7,21 @@
 
 namespace Framework
 {
-    const int M_Links = 0;
-    const int M_Mitte = 1;
-    const int M_Rechts = 2;
-    const int ME_PLinks = 0;
-    const int ME_PRechts = 1;
-    const int ME_PMitte = 2;
-    const int ME_RLinks = 3;
-    const int ME_RRechts = 4;
-    const int ME_RMitte = 5;
-    const int ME_DKLinks = 6;
-    const int ME_DKRechts = 7;
-    const int ME_DKMitte = 8;
-    const int ME_Betritt = 9;
+    const int M_Left = 0;
+    const int M_Middle = 1;
+    const int M_Right = 2;
+    const int ME_PLeft = 0;
+    const int ME_PRight = 1;
+    const int ME_PMiddle = 2;
+    const int ME_RLeft = 3;
+    const int ME_RRight = 4;
+    const int ME_RMiddle = 5;
+    const int ME_DCLeft = 6;
+    const int ME_DCRight = 7;
+    const int ME_DCMiddle = 8;
+    const int ME_Enter = 9;
     const int ME_Leaves = 10;
-    const int ME_Bewegung = 11;
+    const int ME_Move = 11;
     const int ME_UScroll = 12;
     const int ME_DScroll = 13;
     const int ME_RScroll = 14;
@@ -37,7 +37,7 @@ namespace Framework
         //! Y coordinate on screen relative to the drawing position
         int my;
         //! Stores whether the input has already been processed
-        bool verarbeitet;
+        bool processed;
         //! Stores whether the mouse event is inside the object
         //! that contains this object
         bool insideParent;
@@ -57,10 +57,10 @@ namespace Framework
         //! The direction the camera is pointing
         Vec3<float> dir;
         //! Stores whether the input has already been processed
-        bool verarbeitet;
+        bool processed;
     };
 
-    typedef std::function<bool(void*, void*, MouseEvent)> MausAktion;
+    typedef std::function<bool(void*, void*, MouseEvent)> MouseAction;
 
     //! Default mouse event callback function
     //! \param param An arbitrary parameter

ObjFile.cpp

@@ -9,22 +9,22 @@ ObjFile::ObjFile(const char* path)
     : ReferenceCounter()
 {
     file.setFile(path);
-    file.open(File::Style::lesen);
-    Text* line = file.leseZeile();
+    file.open(File::Style::readAll);
+    Text* line = file.readLine();
     while (line)
     {
-        if (line->positionVon("o ") == 0) objectNames.add(line->getTeilText(2));
+        if (line->positionOf("o ") == 0) objectNames.add(line->getTeilText(2));
         line->release();
-        line = file.leseZeile();
+        line = file.readLine();
     }
     file.close();
 }
 
 Vec3<int> ObjFile::parseIndex(Text* s)
 {
-    Text* x = s->getTeilText(0, s->positionVon("/"));
-    Text* y = s->getTeilText(s->positionVon("/") + 1, s->positionVon("/", 1));
-    Text* z = s->getTeilText(s->positionVon("/", 1) + 1);
+    Text* x = s->getTeilText(0, s->positionOf("/"));
+    Text* y = s->getTeilText(s->positionOf("/") + 1, s->positionOf("/", 1));
+    Text* z = s->getTeilText(s->positionOf("/", 1) + 1);
     Vec3<int> result((int)*x, (int)*y, (int)*z);
     x->release();
     y->release();
@@ -40,58 +40,58 @@ void ObjFile::readModel(Model3DData* zTarget)
     Array<Vec3<float>> normals;
     Array<Vec3<int>> indices;
     // read model info
-    Text* line = file.leseZeile();
+    Text* line = file.readLine();
     while (line)
     {
-        if (line->positionVon("o ") == 0)
+        if (line->positionOf("o ") == 0)
         {
             line->release();
             break;
             ;
         }
-        if (line->positionVon("v ") == 0)
+        if (line->positionOf("v ") == 0)
         {
-            Text* x = line->getTeilText(2, line->positionVon(" ", 1));
+            Text* x = line->getTeilText(2, line->positionOf(" ", 1));
             Text* y = line->getTeilText(
-                line->positionVon(" ", 1) + 1, line->positionVon(" ", 2));
-            Text* z = line->getTeilText(line->positionVon(" ", 2) + 1);
+                line->positionOf(" ", 1) + 1, line->positionOf(" ", 2));
+            Text* z = line->getTeilText(line->positionOf(" ", 2) + 1);
             vertices.add(Vec3<float>((float)*x, (float)*y, (float)*z));
             x->release();
             y->release();
             z->release();
         }
-        if (line->positionVon("vt ") == 0)
+        if (line->positionOf("vt ") == 0)
         {
-            Text* x = line->getTeilText(3, line->positionVon(" ", 1));
-            Text* y = line->getTeilText(line->positionVon(" ", 1) + 1);
+            Text* x = line->getTeilText(3, line->positionOf(" ", 1));
+            Text* y = line->getTeilText(line->positionOf(" ", 1) + 1);
             textureCoordinates.add(Vec2<float>((float)*x, (float)*y));
             x->release();
             y->release();
         }
-        if (line->positionVon("vn ") == 0)
+        if (line->positionOf("vn ") == 0)
         {
-            Text* x = line->getTeilText(3, line->positionVon(" ", 1));
+            Text* x = line->getTeilText(3, line->positionOf(" ", 1));
             Text* y = line->getTeilText(
-                line->positionVon(" ", 1) + 1, line->positionVon(" ", 2));
-            Text* z = line->getTeilText(line->positionVon(" ", 2) + 1);
+                line->positionOf(" ", 1) + 1, line->positionOf(" ", 2));
+            Text* z = line->getTeilText(line->positionOf(" ", 2) + 1);
             normals.add(Vec3<float>((float)*x, (float)*y, (float)*z));
             x->release();
             y->release();
             z->release();
         }
-        if (line->positionVon("f ") == 0)
+        if (line->positionOf("f ") == 0)
         {
             // only triangulated meshes ares supported
-            Text* p1 = line->getTeilText(2, line->positionVon(" ", 1));
+            Text* p1 = line->getTeilText(2, line->positionOf(" ", 1));
             Text* p2 = line->getTeilText(
-                line->positionVon(" ", 1) + 1, line->positionVon(" ", 2));
-            Text* p3 = line->getTeilText(line->positionVon(" ", 2) + 1);
+                line->positionOf(" ", 1) + 1, line->positionOf(" ", 2));
+            Text* p3 = line->getTeilText(line->positionOf(" ", 2) + 1);
             indices.add(parseIndex(p1));
             indices.add(parseIndex(p2));
             indices.add(parseIndex(p3));
         }
         line->release();
-        line = file.leseZeile();
+        line = file.readLine();
     }
     // compute vertex data and index buffer
     Array<Vertex3D> modelData;
@@ -129,11 +129,11 @@ void ObjFile::readModel(Model3DData* zTarget)
 
 bool ObjFile::loadModel(const char* name, Model3DData* zTarget)
 {
-    file.open(File::Style::lesen);
-    Text* line = file.leseZeile();
+    file.open(File::Style::readAll);
+    Text* line = file.readLine();
     while (line)
     {
-        if (line->positionVon("o ") == 0 && line->positionVon(name) == 2
+        if (line->positionOf("o ") == 0 && line->positionOf(name) == 2
             && line->getLength() == textLength(name) + 3)
         {
             readModel(zTarget);
@@ -142,7 +142,7 @@ bool ObjFile::loadModel(const char* name, Model3DData* zTarget)
             return 1;
         }
         line->release();
-        line = file.leseZeile();
+        line = file.readLine();
     }
     file.close();
     return 0;

Point.cpp

@@ -8,47 +8,47 @@ using namespace Framework;
 
 // other functions
 #ifdef WIN32
-inline Punkt Framework::ScreenSize(int mId) // Returns the screen size
+inline Point Framework::ScreenSize(int mId) // Returns the screen size
 {
     Monitor m = getMonitor(mId);
-    return Punkt(m.breite, m.height);
+    return Point(m.Width, m.height);
 }
 
-inline Punkt Framework::ScreenCenter(int mId) // Returns the screen center
+inline Point Framework::ScreenCenter(int mId) // Returns the screen center
 {
     Monitor m = getMonitor(mId);
-    return Punkt(m.x + m.breite / 2, m.y + m.height / 2);
+    return Point(m.x + m.Width / 2, m.y + m.height / 2);
 }
 
-inline Punkt Framework::ScreenCenter(
+inline Point Framework::ScreenCenter(
     NativeWindow* f, int mId) // Returns the screen center
 {
-    Punkt p = ScreenCenter(mId);
-    Punkt p2 = f->getGroesse();
+    Point p = ScreenCenter(mId);
+    Point p2 = f->getSize();
     f->release();
     return {p.x - p2.x / 2, p.y - p2.y / 2};
 }
 #endif
 bool Framework::operator>(
-    const Punkt& a, const Punkt& b) // Indicates whether a > b
+    const Point& a, const Point& b) // Indicates whether a > b
 {
     return a.x > b.x && a.y > b.y;
 }
 
 bool Framework::operator<(
-    const Punkt& a, const Punkt& b) // Indicates whether a < b
+    const Point& a, const Point& b) // Indicates whether a < b
 {
     return a.x < b.x && a.y < b.y;
 }
 
 bool Framework::operator<=(
-    const Punkt& a, const Punkt& b) // Indicates whether a <= b
+    const Point& a, const Point& b) // Indicates whether a <= b
 {
     return a.x <= b.x && a.y <= b.y;
 }
 
 bool Framework::operator>=(
-    const Punkt& a, const Punkt& b) // Indicates whether a >= b
+    const Point& a, const Point& b) // Indicates whether a >= b
 {
     return a.x >= b.x && a.y >= b.y;
 }

Point.h

@@ -10,32 +10,32 @@ namespace Framework
     class NativeWindow; //! from Window.h
 
     typedef Vec2<int>
-        Punkt; //! Stores the integer coordinates of a point
+        Point; //! Stores the integer coordinates of a point
 
 #ifdef WIN32
     //! Returns the size of the screen
-    DLLEXPORT Punkt ScreenSize(int mId = 0);
+    DLLEXPORT Point ScreenSize(int mId = 0);
     //! Returns the center of the screen
-    DLLEXPORT Punkt ScreenCenter(int mId = 0);
+    DLLEXPORT Point ScreenCenter(int mId = 0);
     //! Returns a point that can be used as a window position
     //! to center the window \param f The window to center
-    DLLEXPORT Punkt ScreenCenter(NativeWindow* f, int mId = 0);
+    DLLEXPORT Point ScreenCenter(NativeWindow* f, int mId = 0);
 #endif
     //! Checks whether a point is further to the bottom-right than another
     //! \return (true) if the left point is further right and further down.
     //! (false) otherwise
-    DLLEXPORT bool operator>(const Punkt& a, const Punkt& b);
+    DLLEXPORT bool operator>(const Point& a, const Point& b);
     //! Checks whether a point is further to the top-left than another
     //! \return (true) if the left point is further left and further up.
     //! (false) otherwise
-    DLLEXPORT bool operator<(const Punkt& a, const Punkt& b);
+    DLLEXPORT bool operator<(const Point& a, const Point& b);
     //! Checks whether a point is further to the top-left than another
     //! \return (true) if the left point is further left and further up or
     //! equal. (false) otherwise
-    DLLEXPORT inline bool operator<=(const Punkt& a, const Punkt& b);
+    DLLEXPORT inline bool operator<=(const Point& a, const Point& b);
     //! Checks whether a point is further to the bottom-right than another
     //! \return (true) if the left point is further right and further down or
     //! equal. (false) otherwise
-    DLLEXPORT inline bool operator>=(const Punkt& a, const Punkt& b);
+    DLLEXPORT inline bool operator>=(const Point& a, const Point& b);
 } // namespace Framework
 #endif

Process.cpp

@@ -145,7 +145,7 @@ MemoryInfo Process::getMemInfo() const
     return ret;
 }
 
-int Process::getThreadAnzahl() const
+int Process::getThreadCount() const
 {
     int ret = 0;
     DWORD processID = GetCurrentProcessId();

Process.h

@@ -57,7 +57,7 @@ namespace Framework
         //! process (Windows only)
         DLLEXPORT MemoryInfo getMemInfo() const;
         //! Returns the number of threads (Windows only)
-        DLLEXPORT int getThreadAnzahl() const;
+        DLLEXPORT int getThreadCount() const;
 #endif
     };
 } // namespace Framework

Progress.cpp

@@ -20,8 +20,8 @@ ProgressBar::ProgressBar()
       fBgF(0xFF000000),
       fBgImage(0),
       textRd(0),
-      schriftFarbe(0),
-      schriftSize(0)
+      fontColor(0),
+      fontSize(0)
 {
     style = 0;
 }
@@ -36,13 +36,13 @@ ProgressBar::~ProgressBar()
 }
 
 // non-constant
-void ProgressBar::setAktionAnzahl(__int64 ak) // sets the number of actions
+void ProgressBar::setActionCount(__int64 ak) // sets the number of actions
 {
     maxAk = ak;
     rend = 1;
 }
 
-void ProgressBar::aktionPlus(__int64 aktionen) // multiple actions are finished
+void ProgressBar::actionPlus(__int64 aktionen) // multiple actions are finished
 {
     ak += aktionen;
     if (ak > maxAk) ak = maxAk;
@@ -63,17 +63,17 @@ void ProgressBar::setFBorderZ(
     rend = 1;
 }
 
-void ProgressBar::setFRFarbe(int f) // sets the completion border color
+void ProgressBar::setFRColor(int f) // sets the completion border color
 {
     if (!fBorder) fBorder = new LBorder();
-    fBorder->setFarbe(f);
+    fBorder->setColor(f);
     rend = 1;
 }
 
-void ProgressBar::setFRBreite(int br) // sets the completion border width
+void ProgressBar::setFRWidth(int br) // sets the completion border width
 {
     if (!fBorder) fBorder = new LBorder();
-    fBorder->setRamenBreite(br);
+    fBorder->setBorderWidth(br);
     rend = 1;
 }
 
@@ -85,10 +85,10 @@ void ProgressBar::setFAlphaFieldZ(
     rend = 1;
 }
 
-void ProgressBar::setFAFFarbe(int f) // sets the completion AlphaField color
+void ProgressBar::setFAFColor(int f) // sets the completion AlphaField color
 {
     if (!fBuffer) fBuffer = new AlphaField();
-    fBuffer->setFarbe(f);
+    fBuffer->setColor(f);
     rend = 1;
 }
 
@@ -100,7 +100,7 @@ void ProgressBar::setFAFStrength(
     rend = 1;
 }
 
-void ProgressBar::setFBgFarbe(int f) // sets the completion background color
+void ProgressBar::setFBgColor(int f) // sets the completion background color
 {
     fBgF = f;
     rend = 1;
@@ -116,8 +116,8 @@ void ProgressBar::setFBgImageZ(Image* b) // sets 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);
-    fBgImage->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
+    fBgImage->newImage(b->getWidth(), b->getHeight(), 0);
+    fBgImage->drawImage(0, 0, b->getWidth(), b->getHeight(), *b);
     b->release();
     rend = 1;
 }
@@ -137,21 +137,21 @@ void ProgressBar::setFontZ(Font* s) // sets the font
     rend = 1;
 }
 
-void ProgressBar::setSFarbe(int f) // sets the font color
+void ProgressBar::setSColor(int f) // sets the font color
 {
-    schriftFarbe = f;
+    fontColor = f;
     rend = 1;
 }
 
 void ProgressBar::setSSize(unsigned char gr) // sets the font size
 {
-    schriftSize = gr;
+    fontSize = gr;
     rend = 1;
 }
 
 void ProgressBar::render(Image& zRObj) // renders into zRObj
 {
-    if (!hatStyle(Style::Sichtbar)) return;
+    if (!hasStyle(Style::Visible)) return;
     lockDrawable();
     removeStyle(Style::VScroll | Style::HScroll);
     DrawableBackground::render(zRObj);
@@ -164,16 +164,16 @@ void ProgressBar::render(Image& zRObj) // renders into zRObj
     int yy = 0;
     int b = gr.x;
     int h = gr.y;
-    if (hatStyle(Style::L_R))
+    if (hasStyle(Style::L_R))
         b = (int)((gr.x / 100.0) * getProzent());
-    else if (hatStyle(Style::R_L))
+    else if (hasStyle(Style::R_L))
     {
         b = (int)((gr.x / 100.0) * getProzent());
         xx -= b;
     }
-    else if (hatStyle(Style::O_U))
+    else if (hasStyle(Style::O_U))
         h = (int)((gr.y / 100.0) * getProzent());
-    else if (hatStyle(Style::U_O))
+    else if (hasStyle(Style::U_O))
     {
         h = (int)((gr.y / 100.0) * getProzent());
         yy -= h;
@@ -186,78 +186,78 @@ void ProgressBar::render(Image& zRObj) // renders into zRObj
         return;
     }
     int rbr = 0;
-    if (hatStyle(Style::FRahmen) && fBorder)
+    if (hasStyle(Style::FBorder) && fBorder)
     {
         fBorder->setSize(b, h);
         fBorder->render(zRObj);
-        rbr = fBorder->getRBreite();
+        rbr = fBorder->getRWidth();
     }
-    if (hatStyle(Style::FFarbe))
+    if (hasStyle(Style::FColor))
     {
-        if (hatStyle(Style::FAlpha))
+        if (hasStyle(Style::FAlpha))
             zRObj.alphaRegion(rbr, rbr, b - rbr * 2, h - rbr * 2, fBgF);
         else
             zRObj.fillRegion(rbr, rbr, b - rbr * 2, h - rbr * 2, fBgF);
     }
-    if (hatStyle(Style::FImage) && fBgImage)
+    if (hasStyle(Style::FImage) && fBgImage)
     {
-        if (hatStyle(Style::FAlpha))
-            zRObj.alphaImageSkall(
+        if (hasStyle(Style::FAlpha))
+            zRObj.alphaImageScaled(
                 rbr, rbr, gr.x - rbr * 2, gr.y - rbr * 2, *fBgImage);
         else
-            zRObj.alphaImageSkall(
+            zRObj.alphaImageScaled(
                 rbr, rbr, gr.x - rbr * 2, gr.y - rbr * 2, *fBgImage);
     }
-    if (hatStyle(Style::FBuffered) && fBuffer)
+    if (hasStyle(Style::FBuffered) && fBuffer)
     {
         fBuffer->setSize(b - rbr * 2, h - rbr * 2);
         fBuffer->render(zRObj);
     }
     zRObj.releaseDrawOptions();
-    if (hatStyle(Style::Aktionen) && textRd)
+    if (hasStyle(Style::Aktionen) && textRd)
     {
-        textRd->setSchriftSize(schriftSize);
+        textRd->setFontSize(fontSize);
         Text txt = Text("") + ak + "/" + maxAk;
-        if (hatStyle(Style::Prozent))
+        if (hasStyle(Style::Prozent))
             txt += Text(" (") + (int)(getProzent() + 0.5) + "%)";
         zRObj.alphaRegion(
-            rbr + (gr.x - rbr * 2) / 2 - textRd->getTextBreite(txt) / 2,
+            rbr + (gr.x - rbr * 2) / 2 - textRd->getTextWidth(txt) / 2,
             rbr + (gr.y - rbr * 2) / 2 - textRd->getTextHeight(txt) / 2,
-            textRd->getTextBreite(txt),
+            textRd->getTextWidth(txt),
             textRd->getTextHeight(txt),
             0x70000000);
         textRd->renderText(
-            rbr + (gr.x - rbr * 2) / 2 - textRd->getTextBreite(txt) / 2,
+            rbr + (gr.x - rbr * 2) / 2 - textRd->getTextWidth(txt) / 2,
             rbr + (gr.y - rbr * 2) / 2 - textRd->getTextHeight(txt) / 2,
             txt,
             zRObj,
-            schriftFarbe);
+            fontColor);
     }
-    else if (hatStyle(Style::Prozent) && textRd)
+    else if (hasStyle(Style::Prozent) && textRd)
     {
-        textRd->setSchriftSize(schriftSize);
+        textRd->setFontSize(fontSize);
         Text txt;
         txt.append((int)(getProzent() + 0.5));
         txt.append("%");
         zRObj.alphaRegion(
-            rbr + (gr.x - rbr * 2) / 2 - textRd->getTextBreite(txt) / 2,
+            rbr + (gr.x - rbr * 2) / 2 - textRd->getTextWidth(txt) / 2,
             rbr + (gr.y - rbr * 2) / 2 - textRd->getTextHeight(txt) / 2,
-            textRd->getTextBreite(txt),
+            textRd->getTextWidth(txt),
             textRd->getTextHeight(txt),
             0x70000000);
         textRd->renderText(
-            rbr + (gr.x - rbr * 2) / 2 - textRd->getTextBreite(txt) / 2,
+            rbr + (gr.x - rbr * 2) / 2 - textRd->getTextWidth(txt) / 2,
             rbr + (gr.y - rbr * 2) / 2 - textRd->getTextHeight(txt) / 2,
             txt,
             zRObj,
-            schriftFarbe);
+            fontColor);
     }
     zRObj.releaseDrawOptions();
     unlockDrawable();
 }
 
 // constant
-__int64 ProgressBar::getAktionAnzahl() const // returns the number of actions
+__int64 ProgressBar::getActionCount() const // returns the number of actions
 {
     return maxAk;
 }
@@ -295,7 +295,7 @@ AlphaField* ProgressBar::zFAlphaField() const
     return fBuffer;
 }
 
-int ProgressBar::getFBgFarbe() const // returns the completion background color
+int ProgressBar::getFBgColor() const // returns the completion background color
 {
     return fBgF;
 }
@@ -322,7 +322,7 @@ Font* ProgressBar::zFont() const
     return textRd ? textRd->zFont() : 0;
 }
 
-int ProgressBar::getSFarbe() const // returns the font color
+int ProgressBar::getSColor() const // returns the font color
 {
-    return schriftFarbe;
+    return fontColor;
 }

Progress.h

@@ -25,10 +25,10 @@ namespace Framework
             static const __int64 Aktionen = 0x01000000;
             //! Determines whether the progress-covered part of the bar has
             //! its own border
-            static const __int64 FRahmen = 0x002000;
+            static const __int64 FBorder = 0x002000;
             //! Determines whether the progress-covered part of the bar has
             //! its own background color
-            static const __int64 FFarbe = 0x004000;
+            static const __int64 FColor = 0x004000;
             //! Determines whether the progress-covered part of the bar has
             //! its own background image
             static const __int64 FImage = 0x008000;
@@ -50,8 +50,8 @@ namespace Framework
 
             //! Combines flags Visible, Border, Background, BackgroundImage,
             //! FBorder, FImage, L_R, Percent
-            static const __int64 normal = Sichtbar | Border | Hintergrund
-                                        | HImage | FRahmen | FImage | L_R
+            static const __int64 normal = Visible | Border | Background
+                                        | HImage | FBorder | FImage | L_R
                                         | Prozent | Aktionen | HImageScale;
         };
 
@@ -63,8 +63,8 @@ namespace Framework
         int fBgF;
         Image* fBgImage;
         TextRenderer* textRd;
-        int schriftFarbe;
-        unsigned char schriftSize;
+        int fontColor;
+        unsigned char fontSize;
 
     public:
         //! Constructor
@@ -73,11 +73,11 @@ namespace Framework
         DLLEXPORT virtual ~ProgressBar();
         //! Sets the number of operations needed to reach 100% progress
         //! \param ak The number of operations
-        DLLEXPORT void setAktionAnzahl(__int64 ak);
+        DLLEXPORT void setActionCount(__int64 ak);
         //! Indicates that a certain number of operations have been performed
         //! since the last call \param aktionen The operations performed.
         //! Defaults to 1
-        DLLEXPORT void aktionPlus(__int64 aktionen = 1);
+        DLLEXPORT void actionPlus(__int64 aktionen = 1);
         //! Resets all completed operations so that progress starts from 0% again
         DLLEXPORT void reset();
         //! Sets a pointer to the border drawn in the progress-covered part
@@ -85,22 +85,22 @@ namespace Framework
         DLLEXPORT void setFBorderZ(Border* ram);
         //! Sets the color of the border drawn in the progress-covered part
         //! of the bar \param f The color in A8R8G8B8 format
-        DLLEXPORT void setFRFarbe(int f);
+        DLLEXPORT void setFRColor(int f);
         //! Sets the width of the border drawn in the progress-covered part
         //! of the bar \param br The width in pixels
-        DLLEXPORT void setFRBreite(int br);
+        DLLEXPORT void setFRWidth(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 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);
+        DLLEXPORT void setFAFColor(int f);
         //! Sets the strength of the color gradient drawn in the progress-covered
         //! part of the bar \param st The strength
         DLLEXPORT void setFAFStrength(int st);
         //! Sets the background color drawn in the progress-covered part
         //! of the bar \param f The color in A8R8G8B8 format
-        DLLEXPORT void setFBgFarbe(int f);
+        DLLEXPORT void setFBgColor(int f);
         //! Sets a pointer to the background image drawn in the progress-covered
         //! part of the bar \param b The image
         DLLEXPORT void setFBgImageZ(Image* b);
@@ -114,7 +114,7 @@ namespace Framework
         DLLEXPORT void setFontZ(Font* b);
         //! Sets the color of the percentage display
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setSFarbe(int f);
+        DLLEXPORT void setSColor(int f);
         //! Sets the font size of the percentage display
         //! \param gr The height of a line in pixels
         DLLEXPORT void setSSize(unsigned char gr);
@@ -122,7 +122,7 @@ namespace Framework
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
         //! Returns the number of operations needed for 100%
-        DLLEXPORT __int64 getAktionAnzahl() const;
+        DLLEXPORT __int64 getActionCount() const;
         //! Returns the current percentage of progress
         DLLEXPORT double getProzent() const;
         //! Returns the number of completed operations
@@ -139,7 +139,7 @@ namespace Framework
         DLLEXPORT AlphaField* zFAlphaField() const;
         //! Returns the background color in A8R8G8B8 format drawn in the
         //! progress-covered part of the bar
-        DLLEXPORT int getFBgFarbe() const;
+        DLLEXPORT int getFBgColor() const;
         //! Returns the background image drawn in the progress-covered part
         //! of the bar
         DLLEXPORT Image* getFBgImage() const;
@@ -152,7 +152,7 @@ namespace Framework
         //! percentage display
         DLLEXPORT Font* zFont() const;
         //! Returns the color of the percentage display in A8R8G8B8 format
-        DLLEXPORT int getSFarbe() const;
+        DLLEXPORT int getSColor() const;
     };
 } // namespace Framework
 

Reader.cpp

@@ -25,7 +25,7 @@ ByteArrayReader::~ByteArrayReader()
 //! Reads from the resource
 //! \param bytes An array to be filled with bytes from the resource
 //! \param len How many bytes should be read from the resource
-void ByteArrayReader::lese(char* bytes, int len)
+void ByteArrayReader::read(char* bytes, int len)
 {
     if (position < length)
         memcpy(bytes, buffer + position, min(len, length - position));
@@ -34,7 +34,7 @@ void ByteArrayReader::lese(char* bytes, int len)
 
 //! Reads the next line of the resource
 //! \return The read line as Text with line break
-Text* ByteArrayReader::leseZeile()
+Text* ByteArrayReader::readLine()
 {
     if (position >= length) return 0;
     int start = position;
@@ -42,13 +42,13 @@ Text* ByteArrayReader::leseZeile()
         ;
     Text* ret = new Text("");
     ret->fillText('\0', position - start + 1);
-    lese((char*)ret->getText(), position - start + 1);
+    read((char*)ret->getText(), position - start + 1);
     return ret;
 }
 
 //! Checks whether the resource has been fully read
 //!  return 1 if the resource has been fully read. 0 otherwise
-bool ByteArrayReader::istEnde() const
+bool ByteArrayReader::isEnd() const
 {
     return position >= length;
 }

Reader.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "ReferenceCounter.h"
 
@@ -12,13 +12,13 @@ namespace Framework
         //! Reads from the resource
         //! \param bytes An array to be filled with bytes from the resource
         //! \param len How many bytes should be read from the resource
-        virtual void lese(char* bytes, int len) = 0;
+        virtual void read(char* bytes, int len) = 0;
         //! Reads the next line of the resource
         //! \return The read line as Text with line break
-        virtual Text* leseZeile() = 0;
+        virtual Text* readLine() = 0;
         //! Checks whether the resource has been fully read
         //!  return 1 if the resource has been fully read. 0 otherwise
-        virtual bool istEnde() const = 0;
+        virtual bool isEnd() const = 0;
     };
 
     class Reader : public StreamReader
@@ -56,13 +56,13 @@ namespace Framework
         //! Reads from the resource
         //! \param bytes An array to be filled with bytes from the resource
         //! \param len How many bytes should be read from the resource
-        DLLEXPORT void lese(char* bytes, int len) override;
+        DLLEXPORT void read(char* bytes, int len) override;
         //! Reads the next line of the resource
         //! \return The read line as Text with line break
-        DLLEXPORT Text* leseZeile() override;
+        DLLEXPORT Text* readLine() override;
         //! Checks whether the resource has been fully read
         //!  return 1 if the resource has been fully read. 0 otherwise
-        DLLEXPORT bool istEnde() const override;
+        DLLEXPORT bool isEnd() const override;
         //! Sets the position of the byte to be read next
         //! \param pos The index of the byte
         //! \param ende 1 if the index counts from the end of the resource. 0 if

Regex.cpp

@@ -33,7 +33,7 @@ int findEndPos(Text* regex, int startPos, char endChar, char startChar)
 
 Automata<char>* parseCharacterList(Text* regex, RegexConfig& config)
 {
-    bool negated = regex->hatAt(0, "^");
+    bool negated = regex->hasAt(0, "^");
     Automata<char>* result = new Automata<char>();
     State<char>* start = result->addState();
     State<char>* end = result->addState();
@@ -97,7 +97,7 @@ Automata<char>* parseCharacterList(Text* regex, RegexConfig& config)
                             negatedFunction
                                 = [config, negatedFunction](char c, int flags) {
                                       return negatedFunction(c, flags)
-                                          && !config.getWordChars().hat(c);
+                                          && !config.getWordChars().has(c);
                                   };
                         }
                         else
@@ -116,7 +116,7 @@ Automata<char>* parseCharacterList(Text* regex, RegexConfig& config)
                         {
                             start->addTransition(Transition<char>(
                                 [config](char c, int flags) {
-                                    return !config.getWordChars().hat(c);
+                                    return !config.getWordChars().has(c);
                                 },
                                 end,
                                 0));
@@ -146,7 +146,7 @@ Automata<char>* parseCharacterList(Text* regex, RegexConfig& config)
                             negatedFunction = [config, negatedFunction](
                                                   char c, int flags) {
                                 return negatedFunction(c, flags)
-                                    && !config.getWhitespaceChars().hat(c);
+                                    && !config.getWhitespaceChars().has(c);
                             };
                         }
                         else
@@ -183,14 +183,14 @@ Automata<char>* parseCharacterList(Text* regex, RegexConfig& config)
                             negatedFunction
                                 = [config, negatedFunction](char c, int flags) {
                                       return negatedFunction(c, flags)
-                                          && config.getWhitespaceChars().hat(c);
+                                          && config.getWhitespaceChars().has(c);
                                   };
                         }
                         else
                         {
                             start->addTransition(Transition<char>(
                                 [config](char c, int flags) {
-                                    return !config.getWhitespaceChars().hat(c);
+                                    return !config.getWhitespaceChars().has(c);
                                 },
                                 end,
                                 0));
@@ -227,14 +227,14 @@ Automata<char>* parseCharacterList(Text* regex, RegexConfig& config)
     if (negated)
     {
         negatedFunction = [characterList, negatedFunction](char c, int flags) {
-            return negatedFunction(c, flags) && !characterList.hat(c);
+            return negatedFunction(c, flags) && !characterList.has(c);
         };
         start->addTransition(Transition<char>(negatedFunction, end, 0));
     }
     else
     {
         start->addTransition(Transition<char>(
-            [characterList](char c, int flags) { return characterList.hat(c); },
+            [characterList](char c, int flags) { return characterList.has(c); },
             end,
             0));
     }
@@ -288,7 +288,7 @@ Automata<char>* parse(Text* regex, int& nextGroupId, RegexConfig& config)
                 int end = findEndPos(regex, i + 1, ')', '(');
                 Text* subRegex = regex->getTeilText(i + 1, end);
                 Automata<char>* subAutomata = 0;
-                if (subRegex->hatAt(0, "?:"))
+                if (subRegex->hasAt(0, "?:"))
                 {
                     subRegex->remove(0, 2);
                     subAutomata = parse(subRegex, nextGroupId, config);
@@ -373,12 +373,12 @@ Automata<char>* parse(Text* regex, int& nextGroupId, RegexConfig& config)
                 Text* subRegex = regex->getTeilText(i + 1, end);
                 int min = 0;
                 int max = 0;
-                if (subRegex->hat(","))
+                if (subRegex->has(","))
                 {
                     Text* minText
-                        = subRegex->getTeilText(0, subRegex->positionVon(","));
+                        = subRegex->getTeilText(0, subRegex->positionOf(","));
                     Text* maxText
-                        = subRegex->getTeilText(subRegex->positionVon(",") + 1);
+                        = subRegex->getTeilText(subRegex->positionOf(",") + 1);
                     min = (int)*minText;
                     max = (int)*maxText;
                     minText->release();
@@ -455,14 +455,14 @@ Automata<char>* parse(Text* regex, int& nextGroupId, RegexConfig& config)
             case 'w':
                 {
                     function = [config](char c, int flags) {
-                        return config.getWordChars().hat(c);
+                        return config.getWordChars().has(c);
                     };
                     break;
                 }
             case 'W':
                 {
                     function = [config](char c, int flags) {
-                        return !config.getWordChars().hat(c);
+                        return !config.getWordChars().has(c);
                     };
                     break;
                 }
@@ -482,14 +482,14 @@ Automata<char>* parse(Text* regex, int& nextGroupId, RegexConfig& config)
             case 's':
                 {
                     function = [config](char c, int flags) {
-                        return config.getWhitespaceChars().hat(c);
+                        return config.getWhitespaceChars().has(c);
                     };
                     break;
                 }
             case 'S':
                 {
                     function = [config](char c, int flags) {
-                        return !config.getWhitespaceChars().hat(c);
+                        return !config.getWhitespaceChars().has(c);
                     };
                     break;
                 }

Regex.h

@@ -256,7 +256,7 @@ namespace Framework
                     if (current->zState()->getGroupStart()
                         && groupEnds.getEntryCount() > 0)
                     {
-                        if (knownGroups.getWertIndex(
+                        if (knownGroups.getValueIndex(
                                 current->zState()->getGroupStart())
                             < 0)
                         {

RenderThread.cpp

@@ -28,7 +28,7 @@ RenderTh::RenderTh()
 // Destructor
 RenderTh::~RenderTh()
 {
-    beenden();
+    terminate();
     if (bildschirm) bildschirm->release();
     zeit->release();
 }
@@ -56,7 +56,7 @@ void RenderTh::thread() // Render loop
 {
     int val = 0;
     double time = 0;
-    zeit->messungStart();
+    zeit->measureStart();
     double ausgleich = 0;
     while (!stoppen)
     {
@@ -89,11 +89,11 @@ void RenderTh::thread() // Render loop
         }
         ausgleich += 1.0 / maxFps - renderTickTime;
         if (ausgleich > 0) Sleep((int)(ausgleich * 1000));
-        zeit->messungEnde();
-        zeit->messungStart();
+        zeit->measureEnd();
+        zeit->measureStart();
         renderTickTime = zeit->getSekunden();
     }
-    zeit->messungEnde();
+    zeit->measureEnd();
 }
 
 void RenderTh::beginn() // starts rendering
@@ -102,10 +102,10 @@ void RenderTh::beginn() // starts rendering
     start();
 }
 
-void RenderTh::beenden() // terminates the thread
+void RenderTh::terminate() // terminates the thread
 {
     stoppen = 1;
-    warteAufThread(2000);
+    waitForThread(2000);
     if (run) ende();
 }
 

RenderThread.h

@@ -51,7 +51,7 @@ namespace Framework
         //! Starts the render thread
         DLLEXPORT void beginn();
         //! Stops the render thread
-        DLLEXPORT void beenden();
+        DLLEXPORT void terminate();
         //! if true, then nothing will be printed to std::cout
         DLLEXPORT void setQuiet(bool quiet);
         //! Sets the maximum frames per second

Screen.cpp

@@ -35,7 +35,7 @@ Screen::Screen(NativeWindow* f)
       fenster(f),
       members(new RCArray<Drawable>()),
       fillColor(0xFF000000),
-      deckFarbe(0),
+      deckColor(0),
       onTop(0),
       renderOnTop(0),
       renderDrawables(1),
@@ -130,9 +130,9 @@ void Screen::setOnTopDrawable(Drawable* obj) // sets the onTop drawing
     unlock();
 }
 
-void Screen::setdeckFarbe(int f) // sets the overlay color
+void Screen::setdeckColor(int f) // sets the overlay color
 {
-    deckFarbe = f;
+    deckColor = f;
     rend = 1;
 }
 
@@ -164,13 +164,13 @@ void Screen::render()
     unlock();
 }
 
-void Screen::setFillFarbe(int f) // sets the fill color
+void Screen::setFillColor(int f) // sets the fill color
 {
     fillColor = f;
     rend = 1;
 }
 
-void Screen::setVollbild(bool vollbild) // sets fullscreen
+void Screen::setFullscreen(bool vollbild) // sets fullscreen
 {
     lock();
     api->setFullScreen(vollbild);
@@ -208,14 +208,14 @@ void Screen::tick(double tickval)
 }
 
 void Screen::setBackBufferSize(
-int breite, int height) // sets the size of the back buffer
+int Width, int height) // sets the size of the back buffer
 {
     lock();
-    api->setBackBufferSize(Vec2<int>(breite, height));
+    api->setBackBufferSize(Vec2<int>(Width, height));
     unlock();
 }
 
-void Screen::setBackBufferSize(Punkt& size)
+void Screen::setBackBufferSize(Point& size)
 {
     lock();
     api->setBackBufferSize(size);
@@ -229,8 +229,8 @@ void Screen::doMouseEvent(MouseEvent& me) // sends mouse event
 #ifdef WIN32
     if (fenster)
     {
-        fBr = fenster->getKoerperBreite();
-        fHi = fenster->getKoerperHoehe();
+        fBr = fenster->getBodyWidth();
+        fHi = fenster->getBodyHeight();
     }
 #endif
     me.mx = (int)(me.mx * api->getBackBufferSize().x / (double)fBr + 0.5);
@@ -300,23 +300,23 @@ Screen::getMembers() const // returns the drawings
     return members->begin();
 }
 
-int Screen::getFillFarbe() const // returns the fill color
+int Screen::getFillColor() const // returns the fill color
 {
     return fillColor;
 }
 
-bool Screen::istVolbild() const // returns whether fullscreen is on
+bool Screen::isFullscreen() const // returns whether fullscreen is on
 {
     return api->isFullScreen();
 }
 
-const Punkt
+const Point
 Screen::getBackBufferSize() const // returns the size of the back buffer
 {
     return api->getBackBufferSize();
 }
 
-void Screen::warteAufRendern() const // waits for the render function
+void Screen::waitForRendering() const // waits for the render function
 {
     while (rendering)
     {
@@ -350,10 +350,10 @@ int MonitorEnum(HMONITOR m, HDC dc, LPRECT r, LPARAM p)
     info.cbSize = sizeof(info);
     GetMonitorInfo(m, &info);
     Monitor* mon = new Monitor();
-    mon->existiert = 1;
+    mon->exists = 1;
     mon->x = r->left;
     mon->y = r->top;
-    mon->breite = r->right - r->left;
+    mon->Width = r->right - r->left;
     mon->height = r->bottom - r->top;
     mon->name = info.szDevice;
     if (mon->x == 0 && mon->y == 0)
@@ -372,7 +372,7 @@ Monitor Framework::getMonitor(int id)
     if (id < 0)
     {
         Monitor m;
-        m.existiert = 0;
+        m.exists = 0;
         return m;
     }
     Array<Monitor*>* monitore = new Array<Monitor*>();
@@ -383,7 +383,7 @@ Monitor Framework::getMonitor(int id)
     EnumDisplayMonitors(0, 0, (MONITORENUMPROC)MonitorEnum, (LPARAM)monitore);
     int anz = monitore->getEntryCount();
     Monitor result;
-    result.existiert = 0;
+    result.exists = 0;
     result = *monitore->get(id);
     for (Monitor* m : *monitore)
     {
@@ -400,7 +400,7 @@ Screen2D::Screen2D(NativeWindow* fenster)
 {
     api = new DirectX9();
     api->initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
-        fenster->getKoerperGroesse(),
+        fenster->getBodySize(),
         0);
 }
 
@@ -415,14 +415,14 @@ void Screen2D::render() // Draws the image
     if (ui)
     {
         lock();
-        renderTime->messungStart();
+        renderTime->measureStart();
         api->beginFrame(fill && (rend || !testRend), 0, fillColor);
         if (renderDrawables)
         {
-            if (renderOnTop && deckFarbe
-                && (deckFarbe & (fillColor | 0xFF000000)) == deckFarbe)
+            if (renderOnTop && deckColor
+                && (deckColor & (fillColor | 0xFF000000)) == deckColor)
             {
-                ui->setAlpha(255 - (unsigned char)(deckFarbe >> 24));
+                ui->setAlpha(255 - (unsigned char)(deckColor >> 24));
                 for (Drawable* z : *members)
                     z->render(*ui); // draw to intermediate buffer
                 ui->releaseAlpha();
@@ -431,9 +431,9 @@ void Screen2D::render() // Draws the image
             {
                 for (Drawable* z : *members)
                     z->render(*ui); // draw to intermediate buffer
-                if (renderOnTop && deckFarbe)
+                if (renderOnTop && deckColor)
                     ui->alphaRegion(
-                        0, 0, ui->getBreite(), ui->getHeight(), deckFarbe);
+                        0, 0, ui->getWidth(), ui->getHeight(), deckColor);
             }
             for (ArrayIterator<ToolTip*> i = tips->begin(); i; i++)
             {
@@ -443,7 +443,7 @@ void Screen2D::render() // Draws the image
         }
         if (renderOnTop && onTop) onTop->render(*ui);
         api->presentFrame();
-        renderTime->messungEnde();
+        renderTime->measureEnd();
         unlock();
     }
     rendering = 0;
@@ -464,7 +464,7 @@ Screen3D::Screen3D(NativeWindow* fenster)
     else
         api = new DirectX9();
     api->initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
-        fenster->getKoerperGroesse(),
+        fenster->getBodySize(),
         0);
 }
 
@@ -477,7 +477,7 @@ Screen3D::Screen3D(NativeWindow* fenster, GraphicApiType apiTyp)
     if (apiTyp == DIRECTX11) api = new DirectX11();
     if (apiTyp == DIRECTX12) api = new DirectX12();
     api->initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
-        fenster->getKoerperGroesse(),
+        fenster->getBodySize(),
         0);
 }
 
@@ -488,7 +488,7 @@ Screen3D::Screen3D(NativeWindow* fenster, GraphicsApi* api)
 {
     this->api = api;
     api->initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
-        fenster->getKoerperGroesse(),
+        fenster->getBodySize(),
         0);
 }
 
@@ -593,7 +593,7 @@ void Screen3D::render() // Draws the image
 {
     rendering = 1;
     lock();
-    renderTime->messungStart();
+    renderTime->measureStart();
     // Clear the back buffer.
     api->beginFrame(fill && (rend || !testRend),
         fill && (rend3D || !testRend || rend),
@@ -611,10 +611,10 @@ void Screen3D::render() // Draws the image
     {
         if (renderDrawables)
         {
-            if (renderOnTop && deckFarbe
-                && (deckFarbe & (fillColor | 0xFF000000)) == deckFarbe)
+            if (renderOnTop && deckColor
+                && (deckColor & (fillColor | 0xFF000000)) == deckColor)
             {
-                ui->setAlpha(255 - (unsigned char)(deckFarbe >> 24));
+                ui->setAlpha(255 - (unsigned char)(deckColor >> 24));
                 for (Drawable* z : *members)
                     z->render(*ui); // draw to intermediate buffer
                 ui->releaseAlpha();
@@ -623,9 +623,9 @@ void Screen3D::render() // Draws the image
             {
                 for (Drawable* z : *members)
                     z->render(*ui); // draw to intermediate buffer
-                if (renderOnTop && deckFarbe)
+                if (renderOnTop && deckColor)
                     ui->alphaRegion(
-                        0, 0, ui->getBreite(), ui->getHeight(), deckFarbe);
+                        0, 0, ui->getWidth(), ui->getHeight(), deckColor);
             }
             for (ArrayIterator<ToolTip*> i = tips->begin(); i; i++)
             {
@@ -637,7 +637,7 @@ void Screen3D::render() // Draws the image
     }
     api->presentFrame();
     unlock();
-    renderTime->messungEnde();
+    renderTime->measureEnd();
 #    ifdef _DEBUG
     // Logging::trace() << renderTime->getSekunden() << "\n";
 #    endif

Screen.h

@@ -64,9 +64,9 @@ namespace Framework
     //! A structure containing information about a monitor
     struct Monitor
     {
-        int x, y, breite,
+        int x, y, Width,
             height;     //! Coordinates of the monitor and its resolution
-        bool existiert; //! Stores whether the monitor really exists
+        bool exists; //! Stores whether the monitor really exists
         Text name;
     };
 
@@ -78,7 +78,7 @@ namespace Framework
         NativeWindow* fenster;
         RCArray<Drawable>* members;
         int fillColor;
-        int deckFarbe;
+        int deckColor;
         Drawable* onTop;
         bool renderOnTop;
         bool renderDrawables;
@@ -104,7 +104,7 @@ namespace Framework
         //! Passes a void function pointer to an action that should be executed
         //! once by the main thread. Called at the beginning of tick()
         DLLEXPORT void postAction(std::function<void()> action);
-        //! if set to true, then maus and keyboard events are added to a queue
+        //! if set to true, then mouse and keyboard events are added to a queue
         //! and will be handled at the next call of tick. Otherwise they are
         //! handled by the calling thread after waiting for a lock between the
         //! rendering and ticks. This can lead to longer waiting times since the
@@ -143,7 +143,7 @@ namespace Framework
         //! drawing, if setOnTop(1) was set. The drawing set with
         //! setOnTopDrawable() is not affected \param f The color in A8R8G8B8
         //! format
-        DLLEXPORT virtual void setdeckFarbe(int f);
+        DLLEXPORT virtual void setdeckColor(int f);
         //! Adds a drawing to the image that is always drawn when
         //! setRenderDrawables(1) was set. \param obj The drawing
         DLLEXPORT virtual void addMember(Drawable* obj);
@@ -156,23 +156,23 @@ namespace Framework
         DLLEXPORT virtual void render();
         //! Sets the color used to fill the image before drawing, if
         //! setFill(1) was set \param f The color in A8R8G8B8 format
-        DLLEXPORT virtual void setFillFarbe(int f);
+        DLLEXPORT virtual void setFillColor(int f);
         //! Specifies whether the image should be presented in fullscreen mode.
         //! (not set by default) \param fullscreen 1 for fullscreen mode
-        DLLEXPORT virtual void setVollbild(bool fullscreen);
+        DLLEXPORT virtual void setFullscreen(bool fullscreen);
         //! Processes the time elapsed since the last call of this function.
         //! Calls the tick functions of all drawings in the image
         //! \param tickval The elapsed time in seconds
         DLLEXPORT virtual void tick(double tickval);
         //! Sets the resolution of the displayed image. It is automatically
         //! scaled by the graphics card to fill the window
-        //! \param breite The width of the image in pixels
+        //! \param Width The width of the image in pixels
         //! \param height The height of the image in pixels
-        DLLEXPORT virtual void setBackBufferSize(int breite, int height);
+        DLLEXPORT virtual void setBackBufferSize(int Width, int height);
         //! Sets the resolution of the displayed image. It is automatically
         //! scaled by the graphics card to fill the window
         //! \param size The width and height in pixels
-        DLLEXPORT virtual void setBackBufferSize(Punkt& size);
+        DLLEXPORT virtual void setBackBufferSize(Point& size);
         //! Processes a mouse event. Called automatically by the framework.
         //! Passes the event to all drawings in the image
         //! \param me The event
@@ -194,13 +194,13 @@ namespace Framework
         DLLEXPORT virtual ArrayIterator<Drawable*> getMembers() const;
         //! Returns the color in A8R8G8B8 format used to fill the image
         //! before drawing
-        DLLEXPORT virtual int getFillFarbe() const;
+        DLLEXPORT virtual int getFillColor() const;
         //! Returns whether fullscreen mode is active
-        DLLEXPORT virtual bool istVolbild() const;
+        DLLEXPORT virtual bool isFullscreen() const;
         //! Returns the resolution in pixels at which drawing occurs
-        DLLEXPORT virtual const Punkt getBackBufferSize() const;
+        DLLEXPORT virtual const Point getBackBufferSize() const;
         //! Waits until the current image has finished drawing
-        DLLEXPORT virtual void warteAufRendern() const;
+        DLLEXPORT virtual void waitForRendering() const;
         //! Returns the time in seconds needed to draw the last image
         DLLEXPORT virtual double getRenderZeit() const;
         //! Returns the graphics API (without increased reference counter)
@@ -260,7 +260,7 @@ namespace Framework
 
     //! Finds the position and resolution of a monitor
     //! \param id The ID of the monitor. If the monitor was not found,
-    //! the existiert flag of the returned Monitor structure is 0
+    //! the exists flag of the returned Monitor structure is 0
     DLLEXPORT Monitor getMonitor(int id);
 #endif
 } // namespace Framework

Scroll.cpp

@@ -11,10 +11,10 @@ ScrollBar::ScrollBar()
     : ReferenceCounter(),
       data(new ScrollData()),
       knopfdruck(0),
-      farbe(0xFF808080),
-      bgFarbe(0xFF000000),
+      color(0xFF808080),
+      bgColor(0xFF000000),
       bg(0),
-      klickScroll(10),
+      clickScroll(10),
       mx(-1),
       my(-1),
       mp(0),
@@ -28,15 +28,15 @@ ScrollBar::~ScrollBar()
 }
 
 // non-constant
-void ScrollBar::setFarbe(int fc)
+void ScrollBar::setColor(int fc)
 {
-    farbe = fc;
+    color = fc;
     rend = 1;
 }
 
-void ScrollBar::setBgFarbe(int fc, bool bgF)
+void ScrollBar::setBgColor(int fc, bool bgF)
 {
-    bgFarbe = fc;
+    bgColor = fc;
     bg = bgF;
     rend = 1;
 }
@@ -61,9 +61,9 @@ void ScrollBar::update(int maxGr, int anzeigeGr)
     }
 }
 
-void ScrollBar::setKlickScroll(int ks)
+void ScrollBar::setClickScroll(int ks)
 {
-    klickScroll = ks;
+    clickScroll = ks;
     rend = 1;
 }
 
@@ -76,12 +76,12 @@ void ScrollBar::scroll(int height)
     rend = 1;
 }
 
-bool ScrollBar::getRend()
+bool ScrollBar::getNeedRender()
 {
     if (knopfdruck == 1)
     {
         int tmp = data->scrollPos;
-        data->scrollPos -= klickScroll;
+        data->scrollPos -= clickScroll;
         if (data->scrollPos > data->max - data->anzeige)
             data->scrollPos = data->max - data->anzeige;
         if (data->scrollPos < 0) data->scrollPos = 0;
@@ -90,7 +90,7 @@ bool ScrollBar::getRend()
     if (knopfdruck == 2)
     {
         int tmp = data->scrollPos;
-        data->scrollPos += klickScroll;
+        data->scrollPos += clickScroll;
         if (data->scrollPos > data->max - data->anzeige)
             data->scrollPos = data->max - data->anzeige;
         if (data->scrollPos < 0) data->scrollPos = 0;
@@ -107,19 +107,19 @@ ScrollData* ScrollBar::getScrollData() const
     return data;
 }
 
-int ScrollBar::getKlickScroll() const
+int ScrollBar::getClickScroll() const
 {
-    return klickScroll;
+    return clickScroll;
 }
 
-int ScrollBar::getFarbe() const
+int ScrollBar::getColor() const
 {
-    return farbe;
+    return color;
 }
 
-int ScrollBar::getBgFarbe() const
+int ScrollBar::getBgColor() const
 {
-    return bg ? bgFarbe : 0;
+    return bg ? bgColor : 0;
 }
 
 int ScrollBar::getScroll() const
@@ -135,7 +135,7 @@ VScrollBar::VScrollBar()
 // Destructor
 VScrollBar::~VScrollBar() {}
 
-bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
+bool VScrollBar::doMouseMessage(int x, int y, int br, int hi, MouseEvent& me)
 {
     if (me.id == ME_Leaves)
     {
@@ -145,7 +145,7 @@ bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
     }
     bool ret = me.mx >= x && me.mx <= x + br && me.my >= y && me.my <= y + hi;
     knopfdruck = 0;
-    if (me.verarbeitet)
+    if (me.processed)
     {
         mx = -1, my = -1;
         mp = 0;
@@ -153,14 +153,14 @@ bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
     }
     if (me.id == ME_UScroll)
     {
-        data->scrollPos -= klickScroll;
+        data->scrollPos -= clickScroll;
         if (data->scrollPos < 0) data->scrollPos = 0;
         rend = 1;
         return ret;
     }
     if (me.id == ME_DScroll)
     {
-        data->scrollPos += klickScroll;
+        data->scrollPos += clickScroll;
         if (data->scrollPos > data->max - data->anzeige)
             data->scrollPos = data->max - data->anzeige;
         if (data->scrollPos < 0) data->scrollPos = 0;
@@ -171,8 +171,8 @@ bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
         mx = me.mx - x, my = me.my - y;
     else
         mx = -1, my = -1;
-    if (me.id == ME_PLinks) mp = 1;
-    if (me.id == ME_RLinks) mp = 0;
+    if (me.id == ME_PLeft) mp = 1;
+    if (me.id == ME_RLeft) mp = 0;
     if (mp)
     {
         if (mx >= 0 && my >= 0)
@@ -180,12 +180,12 @@ bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
             if (my < br)
             {
                 knopfdruck = 1;
-                data->scrollPos -= klickScroll;
+                data->scrollPos -= clickScroll;
             }
             else if (my > hi - br)
             {
                 knopfdruck = 2;
-                data->scrollPos += klickScroll;
+                data->scrollPos += clickScroll;
             }
             else
                 data->scrollPos
@@ -202,15 +202,15 @@ bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
 
 void VScrollBar::render(int x, int y, int br, int hi, Image& zRObj) const
 {
-    if (bg) zRObj.alphaRegion(x, y, br, hi, bgFarbe);
+    if (bg) zRObj.alphaRegion(x, y, br, hi, bgColor);
     --br;
     --hi;
-    zRObj.drawLinieH(x, y, br + 1, farbe);
-    zRObj.drawLinieH(x, y + hi, br + 1, farbe);
-    zRObj.drawLinieV(x, y + 1, hi - 1, farbe);
-    zRObj.drawLinieV(x + br, y + 1, hi - 1, farbe);
-    zRObj.drawLinieH(x + 1, y + br, br - 1, farbe);
-    zRObj.drawLinieH(x + 1, y + hi - br, br - 1, farbe);
+    zRObj.drawLineH(x, y, br + 1, color);
+    zRObj.drawLineH(x, y + hi, br + 1, color);
+    zRObj.drawLineV(x, y + 1, hi - 1, color);
+    zRObj.drawLineV(x + br, y + 1, hi - 1, color);
+    zRObj.drawLineH(x + 1, y + br, br - 1, color);
+    zRObj.drawLineH(x + 1, y + hi - br, br - 1, color);
     ++br;
     ++hi;
     int st = (int)(data->scrollPos / (data->max / (hi - br * 2.0)));
@@ -222,7 +222,7 @@ void VScrollBar::render(int x, int y, int br, int hi, Image& zRObj) const
         data->scrollPos = 0;
         end = hi - br * 2;
     }
-    zRObj.fillRegion(x + 1, y + br + st, br - 1, end, farbe);
+    zRObj.fillRegion(x + 1, y + br + st, br - 1, end, color);
 }
 
 // Contents of the HScrollBar class from Scroll.h
@@ -235,7 +235,7 @@ HScrollBar::HScrollBar()
 HScrollBar::~HScrollBar() {}
 
 // non-constant
-bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
+bool HScrollBar::doMouseMessage(int x, int y, int br, int hi, MouseEvent& me)
 {
     if (me.id == ME_Leaves)
     {
@@ -245,7 +245,7 @@ bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
     }
     bool ret = me.mx >= x && me.mx <= x + br && me.my >= y && me.my <= y + hi;
     knopfdruck = 0;
-    if (me.verarbeitet)
+    if (me.processed)
     {
         mx = -1, my = -1;
         mp = 0;
@@ -253,14 +253,14 @@ bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
     }
     if (me.id == ME_LScroll)
     {
-        data->scrollPos -= klickScroll;
+        data->scrollPos -= clickScroll;
         if (data->scrollPos < 0) data->scrollPos = 0;
         rend = 1;
         return ret;
     }
     if (me.id == ME_RScroll)
     {
-        data->scrollPos += klickScroll;
+        data->scrollPos += clickScroll;
         if (data->scrollPos > data->max - data->anzeige)
             data->scrollPos = data->max - data->anzeige;
         if (data->scrollPos < 0) data->scrollPos = 0;
@@ -271,8 +271,8 @@ bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
         mx = me.mx - x, my = me.my - y;
     else
         mx = -1, my = -1;
-    if (me.id == ME_PLinks) mp = 1;
-    if (me.id == ME_RLinks) mp = 0;
+    if (me.id == ME_PLeft) mp = 1;
+    if (me.id == ME_RLeft) mp = 0;
     if (mp)
     {
         if (mx >= 0 && my >= 0)
@@ -280,12 +280,12 @@ bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
             if (mx < hi)
             {
                 knopfdruck = 1;
-                data->scrollPos -= klickScroll;
+                data->scrollPos -= clickScroll;
             }
             else if (mx > br - hi)
             {
                 knopfdruck = 2;
-                data->scrollPos += klickScroll;
+                data->scrollPos += clickScroll;
             }
             else
                 data->scrollPos
@@ -302,15 +302,15 @@ bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MouseEvent& me)
 
 void HScrollBar::render(int x, int y, int br, int hi, Image& zRObj) const
 {
-    if (bg) zRObj.alphaRegion(x, y, br, hi, bgFarbe);
+    if (bg) zRObj.alphaRegion(x, y, br, hi, bgColor);
     --br;
     --hi;
-    zRObj.drawLinieV(x, y, hi + 1, farbe);
-    zRObj.drawLinieV(x + br, y, hi + 1, farbe);
-    zRObj.drawLinieH(x + 1, y, br - 1, farbe);
-    zRObj.drawLinieH(x + 1, y + hi, br - 1, farbe);
-    zRObj.drawLinieV(x + hi, y + 1, hi - 1, farbe);
-    zRObj.drawLinieV(x + br - hi, y + 1, hi - 1, farbe);
+    zRObj.drawLineV(x, y, hi + 1, color);
+    zRObj.drawLineV(x + br, y, hi + 1, color);
+    zRObj.drawLineH(x + 1, y, br - 1, color);
+    zRObj.drawLineH(x + 1, y + hi, br - 1, color);
+    zRObj.drawLineV(x + hi, y + 1, hi - 1, color);
+    zRObj.drawLineV(x + br - hi, y + 1, hi - 1, color);
     ++br;
     ++hi;
     int st = (int)(data->scrollPos / (data->max / (br - hi * 2.0)));
@@ -322,5 +322,5 @@ void HScrollBar::render(int x, int y, int br, int hi, Image& zRObj) const
         data->scrollPos = 0;
         end = br - hi * 2;
     }
-    zRObj.fillRegion(x + hi + st, y + 1, end, hi - 1, farbe);
+    zRObj.fillRegion(x + hi + st, y + 1, end, hi - 1, color);
 }

Scroll.h

@@ -22,10 +22,10 @@ namespace Framework
     protected:
         ScrollData* data;
         int knopfdruck;
-        int farbe;
-        int bgFarbe;
+        int color;
+        int bgColor;
         bool bg;
-        int klickScroll;
+        int clickScroll;
         int mx, my;
         bool mp;
         bool rend;
@@ -37,18 +37,18 @@ namespace Framework
         DLLEXPORT virtual ~ScrollBar();
         //! Sets the foreground color of the scrollbar
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setFarbe(int fc);
+        DLLEXPORT void setColor(int fc);
         //! Sets the background color of the scrollbar
         //! \param fc The color in A8R8G8B8 format
         //! \param bgF 1 if a background should be drawn
-        DLLEXPORT void setBgFarbe(int fc, bool bgF);
+        DLLEXPORT void setBgColor(int fc, bool bgF);
         //! Updates the scrollbar
         //! \param maxGr The maximum size of the window in pixels
         //! \param anzeigeGr The displayed size of the window in pixels
         DLLEXPORT void update(int maxGr, int anzeigeGr);
         //! Sets the scroll speed
-        //! \param klickScroll The number of pixels scrolled per click
-        DLLEXPORT void setKlickScroll(int klickScroll);
+        //! \param clickScroll The number of pixels scrolled per click
+        DLLEXPORT void setClickScroll(int clickScroll);
         //! Scrolls to a specific position
         //! \param pos The position in pixels in the window from which drawing
         //! should start
@@ -60,12 +60,12 @@ namespace Framework
         //! \param hi The height of the scroll bar
         //! \return 1 if the message was processed. Does not set the
         //! processed flag of the mouse event
-        DLLEXPORT virtual bool doMausMessage(
+        DLLEXPORT virtual bool doMouseMessage(
             int x, int y, int br, int hi, MouseEvent& me)
             = 0;
         //! Returns whether the scrollbar has changed since the last call of
         //! this function
-        DLLEXPORT bool getRend();
+        DLLEXPORT bool getNeedRender();
         //! Draws the scrollbar
         //! \param x The X position of the scroll bar
         //! \param y The Y position of the scroll bar
@@ -77,11 +77,11 @@ namespace Framework
         //! Returns a pointer to the scroll data
         DLLEXPORT ScrollData* getScrollData() const;
         //! Returns the scroll speed. The number of pixels scrolled per click
-        DLLEXPORT int getKlickScroll() const;
+        DLLEXPORT int getClickScroll() const;
         //! Returns the foreground color of the scrollbar
-        DLLEXPORT int getFarbe() const;
+        DLLEXPORT int getColor() const;
         //! Returns the background color of the scrollbar
-        DLLEXPORT int getBgFarbe() const;
+        DLLEXPORT int getBgColor() const;
         //! Returns the current scroll position
         DLLEXPORT int getScroll() const;
     };
@@ -102,7 +102,7 @@ namespace Framework
         //! \param hi The height of the scroll bar
         //! \return 1 if the message was processed. Does not set the
         //! processed flag of the mouse event
-        DLLEXPORT bool doMausMessage(
+        DLLEXPORT bool doMouseMessage(
             int x, int y, int br, int hi, MouseEvent& me) override;
         //! Draws the scrollbar
         //! \param x The X position of the scroll bar
@@ -130,7 +130,7 @@ namespace Framework
         //! \param hi The height of the scroll bar
         //! \return 1 if the message was processed. Does not set the
         //! processed flag of the mouse event
-        DLLEXPORT bool doMausMessage(
+        DLLEXPORT bool doMouseMessage(
             int x, int y, int br, int hi, MouseEvent& me) override;
         //! Draws the scrollbar
         //! \param x The X position of the scroll bar

SelectionBox.cpp

@@ -23,53 +23,53 @@ SelectionBox::SelectionBox()
       members(new RCArray<TextField>()),
       ausfahren(new Button()),
       selBorder(new LBorder()),
-      auswBgF(0xFF000000),
-      auswBgB(0),
-      auswAf(new AlphaField()),
+      selBgF(0xFF000000),
+      selBgB(0),
+      selAf(new AlphaField()),
       msSelBorder(0),
-      msAuswBgF(0),
-      msAuswBgB(0),
-      msAuswAf(0),
+      msSelBgF(0),
+      msSelBgB(0),
+      msSelAf(0),
       mouseBorder(new LBorder()),
-      mausBgF(0xFF000000),
-      mausBgB(0),
-      mausAf(new AlphaField()),
+      mouseBgF(0xFF000000),
+      mouseBgB(0),
+      mouseAf(new AlphaField()),
       msMouseBorder(0),
-      msMausBgF(0),
-      msMausBgB(0),
-      msMausAf(0),
+      msMouseBgF(0),
+      msMouseBgB(0),
+      msMouseAf(0),
       anzahl(0),
-      auswahl(0),
+      selection(0),
       ausgeklappt(0),
       ausklappHeight(0),
       ausklapMaxHeight(200),
-      eintragHeight(15),
+      entryHeight(15),
       tickval(0),
-      mausEintrag(0),
+      mouseEntry(0),
       scrollAnzeigen(0),
       eAkP(0),
       eAk(0)
 {
     vertikalScrollBar = new VScrollBar();
     style = Style::Normal;
-    rahmen = new LBorder();
-    rahmen->setFarbe(0xFFFFFFFF);
-    rahmen->setRamenBreite(1);
-    ausfahren->setStyle(Button::Style::Sichtbar | Button::Style::Erlaubt
-                        | Button::Style::KlickBuffer);
-    ausfahren->setKBFarbe(0xA0000000);
+    border = new LBorder();
+    border->setColor(0xFFFFFFFF);
+    border->setBorderWidth(1);
+    ausfahren->setStyle(Button::Style::Visible | Button::Style::Allowed
+                        | Button::Style::ClickBuffer);
+    ausfahren->setKBColor(0xA0000000);
     ausfahren->setKBStrength(10);
     ausfahren->setSize(18, 18);
-    ausfahren->setSchriftFarbe(0xFFFFFFFF);
+    ausfahren->setFontColor(0xFFFFFFFF);
     ausfahren->setText("\\/");
-    selBorder->setFarbe(0xFF00FF00);
-    selBorder->setRamenBreite(1);
-    auswAf->setFarbe(0xA000FF00);
-    auswAf->setStrength(7);
-    mouseBorder->setFarbe(0xFF00FF00);
-    mouseBorder->setRamenBreite(1);
-    mausAf->setFarbe(0x5000FF00);
-    mausAf->setStrength(7);
+    selBorder->setColor(0xFF00FF00);
+    selBorder->setBorderWidth(1);
+    selAf->setColor(0xA000FF00);
+    selAf->setStrength(7);
+    mouseBorder->setColor(0xFF00FF00);
+    mouseBorder->setBorderWidth(1);
+    mouseAf->setColor(0x5000FF00);
+    mouseAf->setStrength(7);
     gr.x = 20;
     gr.y = 20;
 }
@@ -82,36 +82,36 @@ SelectionBox::~SelectionBox()
     if (members) members->release();
     if (ausfahren) ausfahren->release();
     if (selBorder) selBorder->release();
-    if (auswBgB) auswBgB->release();
-    if (auswAf) auswAf->release();
+    if (selBgB) selBgB->release();
+    if (selAf) selAf->release();
     if (msSelBorder) msSelBorder->release();
-    if (msAuswAf) msAuswAf->release();
-    if (msAuswBgB) msAuswBgB->release();
-    if (msAuswBgF) msAuswBgF->release();
+    if (msSelAf) msSelAf->release();
+    if (msSelBgB) msSelBgB->release();
+    if (msSelBgF) msSelBgF->release();
     if (mouseBorder) mouseBorder->release();
-    if (mausAf) mausAf->release();
-    if (mausBgB) mausBgB->release();
+    if (mouseAf) mouseAf->release();
+    if (mouseBgB) mouseBgB->release();
     if (msMouseBorder) msMouseBorder->release();
-    if (msMausAf) msMausAf->release();
-    if (msMausBgB) msMausBgB->release();
-    if (msMausBgF) msMausBgF->release();
+    if (msMouseAf) msMouseAf->release();
+    if (msMouseBgB) msMouseBgB->release();
+    if (msMouseBgF) msMouseBgF->release();
 }
 
 void SelectionBox::doMouseEvent(MouseEvent& me, bool userRet) // mouse events
 {
-    if (hatStyleNicht(Style::Erlaubt) || hatStyleNicht(Style::Fokus)
-        || me.verarbeitet)
+    if (hasStyleNot(Style::Allowed) || hasStyleNot(Style::Focus)
+        || me.processed)
     {
         ausgeklappt = 0;
-        me.verarbeitet = 1;
+        me.processed = 1;
         return;
     }
     if (!userRet) return;
-    mausEintrag = -1;
+    mouseEntry = -1;
     bool insideParent = me.insideParent;
     me.insideParent = me.mx >= 0 && me.mx < gr.x && me.my >= 0
                    && me.my < gr.y + ausklappHeight;
-    bool vera = me.verarbeitet;
+    bool vera = me.processed;
     if (ausfahren)
     {
         int tmpMx = me.mx;
@@ -121,34 +121,34 @@ void SelectionBox::doMouseEvent(MouseEvent& me, bool userRet) // mouse events
         ausfahren->doPublicMouseEvent(me);
         me.mx = tmpMx, me.my = tmpMy;
     }
-    if (me.verarbeitet && !vera && me.id == ME_RLinks)
+    if (me.processed && !vera && me.id == ME_RLeft)
     {
         ausgeklappt = !ausgeklappt;
-        if (ausgeklappt) mausEintrag = auswahl;
-        if (scrollAnzeigen) scrollZuEintrag(mausEintrag);
+        if (ausgeklappt) mouseEntry = selection;
+        if (scrollAnzeigen) scrollToEntry(mouseEntry);
     }
-    if (hatStyle(Style::VScroll) && vertikalScrollBar && ausgeklappt
+    if (hasStyle(Style::VScroll) && vertikalScrollBar && ausgeklappt
         && scrollAnzeigen)
     {
         int rbr = 0;
-        if (rahmen && hatStyle(Style::Border)) rbr = rahmen->getRBreite();
+        if (border && hasStyle(Style::Border)) rbr = border->getRWidth();
         if ((me.mx > gr.x - 15 - rbr && me.my > gr.y) || me.id == ME_UScroll
             || me.id == ME_DScroll)
         {
-            vertikalScrollBar->doMausMessage(gr.x - rbr - 15,
+            vertikalScrollBar->doMouseMessage(gr.x - rbr - 15,
                 gr.y,
                 15,
                 vertikalScrollBar->getScrollData()->anzeige,
                 me);
-            me.verarbeitet = 1;
+            me.processed = 1;
         }
     }
-    if (!me.verarbeitet)
+    if (!me.processed)
     {
         int eintr = -1;
         int tmp = me.my - gr.y
                 + (vertikalScrollBar ? vertikalScrollBar->getScroll() : 0);
-        if (hatStyle(Style::MultiStyled))
+        if (hasStyle(Style::MultiStyled))
         {
             for (int i = 0; i < anzahl; ++i)
             {
@@ -165,12 +165,12 @@ void SelectionBox::doMouseEvent(MouseEvent& me, bool userRet) // mouse events
         {
             for (int i = 0; i < anzahl; ++i)
             {
-                if (tmp > 0 && tmp < eintragHeight)
+                if (tmp > 0 && tmp < entryHeight)
                 {
                     eintr = i;
                     break;
                 }
-                tmp -= eintragHeight;
+                tmp -= entryHeight;
             }
         }
         if (ausgeklappt && me.mx > 0 && me.mx < gr.x && me.my > gr.y
@@ -178,18 +178,18 @@ void SelectionBox::doMouseEvent(MouseEvent& me, bool userRet) // mouse events
         {
             if (eintr >= 0)
             {
-                if (me.id == ME_RLinks)
+                if (me.id == ME_RLeft)
                 {
-                    if (auswahl != eintr) rend = 1;
-                    auswahl = eintr;
-                    if (eAk) eAk(eAkP, this, 0, auswahl);
+                    if (selection != eintr) rend = 1;
+                    selection = eintr;
+                    if (eAk) eAk(eAkP, this, 0, selection);
                 }
-                if (mausEintrag != eintr) rend = 1;
-                mausEintrag = eintr;
+                if (mouseEntry != eintr) rend = 1;
+                mouseEntry = eintr;
             }
         }
     }
-    me.verarbeitet = 1;
+    me.processed = 1;
     me.insideParent = insideParent;
 }
 
@@ -205,13 +205,13 @@ void SelectionBox::setEventAktion(
     this->eAk = event;
 }
 
-void SelectionBox::setFontZ(Font* schrift) // set font
+void SelectionBox::setFontZ(Font* font) // set font
 {
     if (!this->textRd)
-        textRd = new TextRenderer(schrift);
+        textRd = new TextRenderer(font);
     else
-        textRd->setFontZ(schrift);
-    ausfahren->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
+        textRd->setFontZ(font);
+    ausfahren->setFontZ(dynamic_cast<Font*>(font->getThis()));
     rend = 1;
 }
 
@@ -221,50 +221,50 @@ void SelectionBox::setTextRendererZ(TextRenderer* textRd)
     this->textRd = textRd;
 }
 
-void SelectionBox::addEintrag(const char* txt) // add entry
+void SelectionBox::addEntry(const char* txt) // add entry
 {
     TextField* tf = new TextField();
     if (textRd) tf->setFontZ(textRd->getFont());
-    tf->addStyle(TextField::Style::Sichtbar | TextField::Style::Center
+    tf->addStyle(TextField::Style::Visible | TextField::Style::Center
                  | TextField::Style::Border);
     tf->setText(txt);
-    tf->setSchriftFarbe(0xFFFFFFFF);
+    tf->setFontColor(0xFFFFFFFF);
     tf->setBorderColor(0xFFFFFFFF);
-    tf->setSize(0, eintragHeight);
+    tf->setSize(0, entryHeight);
     members->add(tf, anzahl);
     ++anzahl;
     rend = 1;
 }
 
-void SelectionBox::addEintrag(Text* txt)
+void SelectionBox::addEntry(Text* txt)
 {
     TextField* tf = new TextField();
     if (textRd) tf->setFontZ(textRd->getFont());
-    tf->addStyle(TextField::Style::Sichtbar | TextField::Style::Center
+    tf->addStyle(TextField::Style::Visible | TextField::Style::Center
                  | TextField::Style::Border);
     tf->setText(txt);
-    tf->setSchriftFarbe(0xFFFFFFFF);
+    tf->setFontColor(0xFFFFFFFF);
     tf->setBorderColor(0xFFFFFFFF);
-    tf->setSize(0, eintragHeight);
+    tf->setSize(0, entryHeight);
     members->add(tf, anzahl);
     ++anzahl;
     rend = 1;
 }
 
-void SelectionBox::addEintragZ(TextField* txt)
+void SelectionBox::addEntryZ(TextField* txt)
 {
     members->add(txt, anzahl);
     ++anzahl;
     rend = 1;
 }
 
-void SelectionBox::setEintrag(int i, const char* txt) // set entry text
+void SelectionBox::setEntry(int i, const char* txt) // set entry text
 {
     if (members->z(i)) members->z(i)->setText(txt);
     rend = 1;
 }
 
-void SelectionBox::setEintrag(int i, Text* txt)
+void SelectionBox::setEntry(int i, Text* txt)
 {
     if (members->z(i))
         members->z(i)->setText(txt);
@@ -273,7 +273,7 @@ void SelectionBox::setEintrag(int i, Text* txt)
     rend = 1;
 }
 
-void SelectionBox::setEintragZ(int i, TextField* txt)
+void SelectionBox::setEntryZ(int i, TextField* txt)
 {
     if (i < anzahl)
         members->set(txt, i);
@@ -282,22 +282,22 @@ void SelectionBox::setEintragZ(int i, TextField* txt)
     rend = 1;
 }
 
-void SelectionBox::removeEintrag(int i) // remove entry
+void SelectionBox::removeEntry(int i) // remove entry
 {
     if (i < anzahl)
     {
         members->remove(i);
         if (msStyle) msStyle->remove(i);
         if (msSelBorder) msSelBorder->remove(i);
-        if (msAuswBgF) msAuswBgF->remove(i);
-        if (msAuswBgB) msAuswBgB->remove(i);
-        if (msAuswAf) msAuswAf->remove(i);
+        if (msSelBgF) msSelBgF->remove(i);
+        if (msSelBgB) msSelBgB->remove(i);
+        if (msSelAf) msSelAf->remove(i);
         if (msMouseBorder) msMouseBorder->remove(i);
-        if (msMausBgF) msMausBgF->remove(i);
-        if (msMausBgB) msMausBgB->remove(i);
-        if (msMausAf) msMausAf->remove(i);
-        if (auswahl > i) --auswahl;
-        if (mausEintrag > i) --mausEintrag;
+        if (msMouseBgF) msMouseBgF->remove(i);
+        if (msMouseBgB) msMouseBgB->remove(i);
+        if (msMouseAf) msMouseAf->remove(i);
+        if (selection > i) --selection;
+        if (mouseEntry > i) --mouseEntry;
         --anzahl;
         rend = 1;
     }
@@ -310,49 +310,49 @@ void SelectionBox::setDropDownButtonZ(Button* ausK) // set expand button
     rend = 1;
 }
 
-void SelectionBox::setEntryBorderZ(int i, Border* rahmen) // set entry border
+void SelectionBox::setEntryBorderZ(int i, Border* border) // set entry border
 {
     if (members->z(i))
-        members->z(i)->setBorderZ(rahmen);
+        members->z(i)->setBorderZ(border);
     else
-        rahmen->release();
+        border->release();
     rend = 1;
 }
 
-void SelectionBox::setEintragRahmenFarbe(int i, int f) // set entry border color
+void SelectionBox::setEntryBorderColor(int i, int f) // set entry border color
 {
     if (members->z(i)) members->z(i)->setBorderColor(f);
     rend = 1;
 }
 
-void SelectionBox::setEintragRahmenBreite(
+void SelectionBox::setEntryBorderWidth(
     int i, int rbr) // set entry border width
 {
     if (members->z(i)) members->z(i)->setBorderWidth(rbr);
     rend = 1;
 }
 
-void SelectionBox::setEintragHintergrundFarbe(
+void SelectionBox::setEntryBackgroundColor(
     int i, int f) // set entry background color
 {
-    if (members->z(i)) members->z(i)->setHintergrundFarbe(f);
+    if (members->z(i)) members->z(i)->setBackgroundColor(f);
     rend = 1;
 }
 
-void SelectionBox::setEintragHintergrundImageZ(
+void SelectionBox::setEntryBackgroundImageZ(
     int i, Image* bgB) // set entry background image
 {
     if (members->z(i))
-        members->z(i)->setHintergrundImageZ(bgB);
+        members->z(i)->setBackgroundImageZ(bgB);
     else
         bgB->release();
     rend = 1;
 }
 
-void SelectionBox::setEintragHintergrundImage(int i, Image* bgB)
+void SelectionBox::setEntryBackgroundImage(int i, Image* bgB)
 {
     if (members->z(i))
-        members->z(i)->setHintergrundImage(bgB);
+        members->z(i)->setBackgroundImage(bgB);
     else
         bgB->release();
     rend = 1;
@@ -365,162 +365,162 @@ void SelectionBox::setEntryAlphaFieldZ(
     rend = 1;
 }
 
-void SelectionBox::setEintragAlphaFeldFarbe(
+void SelectionBox::setEntryAlphaFieldColor(
     int i, int afF) // set entry AlphaField color
 {
     if (members->z(i)) members->z(i)->setAlphaFieldColor(afF);
     rend = 1;
 }
 
-void SelectionBox::setEintragAlphaFeldStrength(
+void SelectionBox::setEntryAlphaFieldStrength(
     int i, int afSt) // set entry AlphaField strength
 {
     if (members->z(i)) members->z(i)->setAlphaFieldStrength(afSt);
     rend = 1;
 }
 
-void SelectionBox::setSelBorderZ(Border* rahmen) // set selection border
+void SelectionBox::setSelBorderZ(Border* border) // set selection border
 {
     if (selBorder) selBorder->release();
-    selBorder = rahmen;
+    selBorder = border;
     rend = 1;
 }
 
-void SelectionBox::setAuswRahmenFarbe(int f) // set selection border color
+void SelectionBox::setSelBorderColor(int f) // set selection border color
 {
     if (!selBorder) selBorder = new LBorder();
-    selBorder->setFarbe(f);
+    selBorder->setColor(f);
     rend = 1;
 }
 
-void SelectionBox::setAuswRahmenBreite(int rbr) // set selection border width
+void SelectionBox::setSelBorderWidth(int rbr) // set selection border width
 {
     if (!selBorder) selBorder = new LBorder();
-    selBorder->setRamenBreite(rbr);
+    selBorder->setBorderWidth(rbr);
     rend = 1;
 }
 
-void SelectionBox::setAuswHintergrundFarbe(
+void SelectionBox::setSelBackgroundColor(
     int f) // set selection background color
 {
-    auswBgF = f;
+    selBgF = f;
     rend = 1;
 }
 
-void SelectionBox::setAuswHintergrundImageZ(
+void SelectionBox::setSelBackgroundImageZ(
     Image* bgB) // set selection background image
 {
-    if (auswBgB) auswBgB->release();
-    auswBgB = bgB;
+    if (selBgB) selBgB->release();
+    selBgB = bgB;
     rend = 1;
 }
 
-void SelectionBox::setAuswHintergrundImage(Image* bgB)
+void SelectionBox::setSelBackgroundImage(Image* bgB)
 {
-    if (!auswBgB) auswBgB = new Image();
-    auswBgB->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
-    auswBgB->drawImage(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
+    if (!selBgB) selBgB = new Image();
+    selBgB->newImage(bgB->getWidth(), bgB->getHeight(), 0);
+    selBgB->drawImage(0, 0, bgB->getWidth(), bgB->getHeight(), *bgB);
     bgB->release();
     rend = 1;
 }
 
 void SelectionBox::setSelAlphaFieldZ(AlphaField* af) // set selection AlphaField
 {
-    if (auswAf) auswAf->release();
-    auswAf = af;
+    if (selAf) selAf->release();
+    selAf = af;
     rend = 1;
 }
 
 void SelectionBox::setSelAlphaFieldColor(int afF) // set selection AlphaField color
 {
-    if (!auswAf) auswAf = new AlphaField();
-    auswAf->setFarbe(afF);
+    if (!selAf) selAf = new AlphaField();
+    selAf->setColor(afF);
     rend = 1;
 }
 
-void SelectionBox::setAuswAlphaFeldStrength(
+void SelectionBox::setSelAlphaFieldStrength(
     int afSt) // set selection AlphaField strength
 {
-    if (!auswAf) auswAf = new AlphaField();
-    auswAf->setStrength(afSt);
+    if (!selAf) selAf = new AlphaField();
+    selAf->setStrength(afSt);
     rend = 1;
 }
 
 void SelectionBox::setMsSelBorderZ(
-    int i, Border* rahmen) // set multistyle selection border
+    int i, Border* border) // set multistyle selection border
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl)
     {
-        rahmen->release();
+        border->release();
         return;
     }
     if (!msSelBorder) msSelBorder = new RCArray<Border>();
-    msSelBorder->set(rahmen, i);
+    msSelBorder->set(border, i);
     rend = 1;
 }
 
-void SelectionBox::setMsAuswRahmenFarbe(
+void SelectionBox::setMsSelBorderColor(
     int i, int f) // set multistyle selection border color
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
     if (!msSelBorder) msSelBorder = new RCArray<Border>();
     if (!msSelBorder->z(i)) msSelBorder->set(new LBorder(), i);
-    msSelBorder->z(i)->setFarbe(f);
+    msSelBorder->z(i)->setColor(f);
     rend = 1;
 }
 
-void SelectionBox::setMsAuswRahmenBreite(
+void SelectionBox::setMsSelBorderWidth(
     int i, int rbr) // set multistyle selection width
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
     if (!msSelBorder) msSelBorder = new RCArray<Border>();
     if (!msSelBorder->z(i)) msSelBorder->set(new LBorder(), i);
-    msSelBorder->z(i)->setRamenBreite(rbr);
+    msSelBorder->z(i)->setBorderWidth(rbr);
     rend = 1;
 }
 
-void SelectionBox::setMsAuswHintergrundFarbe(
+void SelectionBox::setMsSelBackgroundColor(
     int i, int f) // set multistyle selection background color
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msAuswBgF) msAuswBgF = new Array<int>();
-    msAuswBgF->set(f, i);
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
+    if (!msSelBgF) msSelBgF = new Array<int>();
+    msSelBgF->set(f, i);
     rend = 1;
 }
 
-void SelectionBox::setMsAuswHintergrundImageZ(
+void SelectionBox::setMsSelBackgroundImageZ(
     int i, Image* bgB) // set multistyle selection background image
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl)
     {
         bgB->release();
         return;
     }
-    if (!msAuswBgB) msAuswBgB = new RCArray<Image>();
-    msAuswBgB->set(bgB, i);
+    if (!msSelBgB) msSelBgB = new RCArray<Image>();
+    msSelBgB->set(bgB, i);
     rend = 1;
 }
 
-void SelectionBox::setMsAuswHintergrundImage(int i, Image* bgB)
+void SelectionBox::setMsSelBackgroundImage(int i, Image* bgB)
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl)
     {
         bgB->release();
         return;
     }
-    if (!msAuswBgB) msAuswBgB = new RCArray<Image>();
-    if (!msAuswBgB->z(i))
+    if (!msSelBgB) msSelBgB = new RCArray<Image>();
+    if (!msSelBgB->z(i))
     {
         Image* z = new Image;
-        z->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
-        z->drawImage(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
-        msAuswBgB->set(z, i);
+        z->newImage(bgB->getWidth(), bgB->getHeight(), 0);
+        z->drawImage(0, 0, bgB->getWidth(), bgB->getHeight(), *bgB);
+        msSelBgB->set(z, i);
     }
     else
     {
-        msAuswBgB->z(i)->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
-        msAuswBgB->z(i)->drawImage(
-            0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
+        msSelBgB->z(i)->newImage(bgB->getWidth(), bgB->getHeight(), 0);
+        msSelBgB->z(i)->drawImage(
+            0, 0, bgB->getWidth(), bgB->getHeight(), *bgB);
     }
     bgB->release();
     rend = 1;
@@ -529,177 +529,177 @@ void SelectionBox::setMsAuswHintergrundImage(int i, Image* bgB)
 void SelectionBox::setMsSelAlphaFieldZ(
     int i, AlphaField* af) // set multistyle selection AlphaField
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl)
     {
         af->release();
         return;
     }
-    if (!msAuswAf) msAuswAf = new RCArray<AlphaField>();
-    msAuswAf->set(af, i);
+    if (!msSelAf) msSelAf = new RCArray<AlphaField>();
+    msSelAf->set(af, i);
     rend = 1;
 }
 
-void SelectionBox::setMsAuswAlphaFeldFarbe(
+void SelectionBox::setMsSelAlphaFieldColor(
     int i, int afF) // set multistyle selection AlphaField color
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msAuswAf) msAuswAf = new RCArray<AlphaField>();
-    if (!msAuswAf->z(i)) msAuswAf->set(new AlphaField(), i);
-    msAuswAf->z(i)->setFarbe(afF);
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
+    if (!msSelAf) msSelAf = new RCArray<AlphaField>();
+    if (!msSelAf->z(i)) msSelAf->set(new AlphaField(), i);
+    msSelAf->z(i)->setColor(afF);
     rend = 1;
 }
 
-void SelectionBox::setMsAuswAlphaFeldStrength(
+void SelectionBox::setMsSelAlphaFieldStrength(
     int i, int afSt) // set multistyle selection AlphaField strength
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msAuswAf) msAuswAf = new RCArray<AlphaField>();
-    if (!msAuswAf->z(i)) msAuswAf->set(new AlphaField(), i);
-    msAuswAf->z(i)->setStrength(afSt);
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
+    if (!msSelAf) msSelAf = new RCArray<AlphaField>();
+    if (!msSelAf->z(i)) msSelAf->set(new AlphaField(), i);
+    msSelAf->z(i)->setStrength(afSt);
     rend = 1;
 }
 
-void SelectionBox::setMouseBorderZ(Border* rahmen) // set mouse border
+void SelectionBox::setMouseBorderZ(Border* border) // set mouse border
 {
     if (mouseBorder) mouseBorder->release();
-    mouseBorder = rahmen;
+    mouseBorder = border;
     rend = 1;
 }
 
-void SelectionBox::setMausRahmenFarbe(int f) // set mouse border color
+void SelectionBox::setMouseBorderColor(int f) // set mouse border color
 {
     if (!mouseBorder) mouseBorder = new LBorder();
-    mouseBorder->setFarbe(f);
+    mouseBorder->setColor(f);
     rend = 1;
 }
 
-void SelectionBox::setMausRahmenBreite(int rbr) // set mouse border width
+void SelectionBox::setMouseBorderWidth(int rbr) // set mouse border width
 {
     if (!mouseBorder) mouseBorder = new LBorder();
-    mouseBorder->setRamenBreite(rbr);
+    mouseBorder->setBorderWidth(rbr);
     rend = 1;
 }
 
-void SelectionBox::setMausHintergrundFarbe(int f) // set mouse background color
+void SelectionBox::setMouseBackgroundColor(int f) // set mouse background color
 {
-    mausBgF = f;
+    mouseBgF = f;
     rend = 1;
 }
 
-void SelectionBox::setMausHintergrundImageZ(
+void SelectionBox::setMouseBackgroundImageZ(
     Image* bgB) // set mouse background image
 {
-    if (mausBgB) mausBgB->release();
-    mausBgB = bgB;
+    if (mouseBgB) mouseBgB->release();
+    mouseBgB = bgB;
     rend = 1;
 }
 
-void SelectionBox::setMausHintergrundImage(Image* bgB)
+void SelectionBox::setMouseBackgroundImage(Image* bgB)
 {
-    if (!mausBgB) mausBgB = new Image();
-    mausBgB->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
-    mausBgB->drawImage(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
+    if (!mouseBgB) mouseBgB = new Image();
+    mouseBgB->newImage(bgB->getWidth(), bgB->getHeight(), 0);
+    mouseBgB->drawImage(0, 0, bgB->getWidth(), bgB->getHeight(), *bgB);
     bgB->release();
     rend = 1;
 }
 
 void SelectionBox::setMouseAlphaFieldZ(AlphaField* af) // set mouse AlphaField
 {
-    if (mausAf) mausAf->release();
-    mausAf = af;
+    if (mouseAf) mouseAf->release();
+    mouseAf = af;
     rend = 1;
 }
 
 void SelectionBox::setMouseAlphaFieldColor(int afF) // set mouse AlphaField color
 {
-    if (!mausAf) mausAf = new AlphaField();
-    mausAf->setFarbe(afF);
+    if (!mouseAf) mouseAf = new AlphaField();
+    mouseAf->setColor(afF);
     rend = 1;
 }
 
-void SelectionBox::setMausAlphaFeldStrength(
+void SelectionBox::setMouseAlphaFieldStrength(
     int afSt) // set mouse AlphaField strength
 {
-    if (!mausAf) mausAf = new AlphaField();
-    mausAf->setStrength(afSt);
+    if (!mouseAf) mouseAf = new AlphaField();
+    mouseAf->setStrength(afSt);
     rend = 1;
 }
 
 void SelectionBox::setMsMouseBorderZ(
-    int i, Border* rahmen) // set multistyle mouse border
+    int i, Border* border) // set multistyle mouse border
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl)
     {
-        rahmen->release();
+        border->release();
         return;
     }
     if (!msMouseBorder) msMouseBorder = new RCArray<Border>();
-    msMouseBorder->set(rahmen, i);
+    msMouseBorder->set(border, i);
     rend = 1;
 }
 
-void SelectionBox::setMsMausRahmenFarbe(
+void SelectionBox::setMsMouseBorderColor(
     int i, int f) // set multistyle mouse border color
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
     if (!msMouseBorder) msMouseBorder = new RCArray<Border>();
     if (!msMouseBorder->z(i)) msMouseBorder->set(new LBorder(), i);
-    msMouseBorder->z(i)->setFarbe(f);
+    msMouseBorder->z(i)->setColor(f);
     rend = 1;
 }
 
-void SelectionBox::setMsMausRahmenBreite(
+void SelectionBox::setMsMouseBorderWidth(
     int i, int rbr) // set multistyle mouse border width
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
     if (!msMouseBorder) msMouseBorder = new RCArray<Border>();
     if (!msMouseBorder->z(i)) msMouseBorder->set(new LBorder(), i);
-    msMouseBorder->z(i)->setRamenBreite(rbr);
+    msMouseBorder->z(i)->setBorderWidth(rbr);
     rend = 1;
 }
 
-void SelectionBox::setMsMausHintergrundFarbe(
+void SelectionBox::setMsMouseBackgroundColor(
     int i, int f) // set multistyle mouse background color
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msMausBgF) msMausBgF = new Array<int>();
-    msMausBgF->set(f, i);
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
+    if (!msMouseBgF) msMouseBgF = new Array<int>();
+    msMouseBgF->set(f, i);
     rend = 1;
 }
 
-void SelectionBox::setMsMausHintergrundImageZ(
+void SelectionBox::setMsMouseBackgroundImageZ(
     int i, Image* bgB) // set multistyle mouse background image
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl)
     {
         bgB->release();
         return;
     }
-    if (!msMausBgB) msMausBgB = new RCArray<Image>();
-    msMausBgB->set(bgB, i);
+    if (!msMouseBgB) msMouseBgB = new RCArray<Image>();
+    msMouseBgB->set(bgB, i);
     rend = 1;
 }
 
-void SelectionBox::setMsMausHintergrundImage(int i, Image* bgB)
+void SelectionBox::setMsMouseBackgroundImage(int i, Image* bgB)
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl)
     {
         bgB->release();
         return;
     }
-    if (!msMausBgB) msMausBgB = new RCArray<Image>();
-    if (!msMausBgB->z(i))
+    if (!msMouseBgB) msMouseBgB = new RCArray<Image>();
+    if (!msMouseBgB->z(i))
     {
         Image* z = new Image;
-        z->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
-        z->drawImage(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
-        msMausBgB->set(z, i);
+        z->newImage(bgB->getWidth(), bgB->getHeight(), 0);
+        z->drawImage(0, 0, bgB->getWidth(), bgB->getHeight(), *bgB);
+        msMouseBgB->set(z, i);
     }
     else
     {
-        msMausBgB->z(i)->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
-        msMausBgB->z(i)->drawImage(
-            0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
+        msMouseBgB->z(i)->newImage(bgB->getWidth(), bgB->getHeight(), 0);
+        msMouseBgB->z(i)->drawImage(
+            0, 0, bgB->getWidth(), bgB->getHeight(), *bgB);
     }
     bgB->release();
     rend = 1;
@@ -708,68 +708,68 @@ void SelectionBox::setMsMausHintergrundImage(int i, Image* bgB)
 void SelectionBox::setMsMouseAlphaFieldZ(
     int i, AlphaField* af) // set multistyle mouse AlphaField
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl)
     {
         af->release();
         return;
     }
-    if (!msMausAf) msMausAf = new RCArray<AlphaField>();
-    msMausAf->set(af, i);
+    if (!msMouseAf) msMouseAf = new RCArray<AlphaField>();
+    msMouseAf->set(af, i);
     rend = 1;
 }
 
-void SelectionBox::setMsMausAlphaFeldFarbe(
+void SelectionBox::setMsMouseAlphaFieldColor(
     int i, int afF) // set multistyle mouse AlphaField color
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msMausAf) msMausAf = new RCArray<AlphaField>();
-    if (!msMausAf->z(i)) msMausAf->set(new AlphaField(), i);
-    msMausAf->z(i)->setFarbe(afF);
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
+    if (!msMouseAf) msMouseAf = new RCArray<AlphaField>();
+    if (!msMouseAf->z(i)) msMouseAf->set(new AlphaField(), i);
+    msMouseAf->z(i)->setColor(afF);
     rend = 1;
 }
 
-void SelectionBox::setMsMausAlphaFeldStrength(
+void SelectionBox::setMsMouseAlphaFieldStrength(
     int i, int afSt) // set multistyle mouse AlphaField strength
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msMausAf) msMausAf = new RCArray<AlphaField>();
-    if (!msMausAf->z(i)) msMausAf->set(new AlphaField(), i);
-    msMausAf->z(i)->setStrength(afSt);
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
+    if (!msMouseAf) msMouseAf = new RCArray<AlphaField>();
+    if (!msMouseAf->z(i)) msMouseAf->set(new AlphaField(), i);
+    msMouseAf->z(i)->setStrength(afSt);
     rend = 1;
 }
 
-void SelectionBox::setAuswahl(int i) // select entry
+void SelectionBox::setSelection(int i) // select entry
 {
-    if (i < anzahl && i != auswahl)
+    if (i < anzahl && i != selection)
     {
-        auswahl = i;
-        if (eAk) eAk(eAkP, this, 0, auswahl);
+        selection = i;
+        if (eAk) eAk(eAkP, this, 0, selection);
         rend = 1;
     }
 }
 
-void SelectionBox::ausklappen() // expand list
+void SelectionBox::expand() // expand list
 {
     ausgeklappt = 1;
 }
 
-void SelectionBox::einklappen() // collapse list
+void SelectionBox::collapse() // collapse list
 {
     ausgeklappt = 0;
 }
 
-void SelectionBox::scrollZuEintrag(int i) // scroll list
+void SelectionBox::scrollToEntry(int i) // scroll list
 {
-    if (hatStyle(Style::VScroll) && vertikalScrollBar && i < anzahl)
+    if (hasStyle(Style::VScroll) && vertikalScrollBar && i < anzahl)
     {
         int scrollPos = 0;
-        if (hatStyle(Style::MultiStyled))
+        if (hasStyle(Style::MultiStyled))
         {
             for (int j = 0; j < i; ++j)
                 scrollPos += members->z(j) ? members->z(j)->getHeight() : 0;
         }
         else
-            scrollPos += i * eintragHeight;
+            scrollPos += i * entryHeight;
         vertikalScrollBar->scroll(scrollPos);
         rend = 1;
     }
@@ -781,14 +781,14 @@ void SelectionBox::setMaxAuskappHeight(
     ausklapMaxHeight = maxHeight;
 }
 
-void SelectionBox::setEintragHeight(int height) // sets the height of the entries
+void SelectionBox::setEntryHeight(int height) // sets the height of the entries
 {
-    eintragHeight = height;
+    entryHeight = height;
 }
 
 void SelectionBox::addMsStyle(int i, __int64 abStyle) // add multistyle style
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
     if (!msStyle) msStyle = new Array<__int64>();
     msStyle->set(msStyle->get(i) | abStyle, i);
     rend = 1;
@@ -797,7 +797,7 @@ void SelectionBox::addMsStyle(int i, __int64 abStyle) // add multistyle style
 void SelectionBox::setMsStyle(
     int i, __int64 abStyle, bool add) // set multistyle style
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
     if (!msStyle) msStyle = new Array<__int64>();
     if (add)
         msStyle->set(msStyle->get(i) | abStyle, i);
@@ -808,7 +808,7 @@ void SelectionBox::setMsStyle(
 
 void SelectionBox::setMsStyle(int i, __int64 abStyle)
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
     if (!msStyle) msStyle = new Array<__int64>();
     msStyle->set(abStyle, i);
     rend = 1;
@@ -817,7 +817,7 @@ void SelectionBox::setMsStyle(int i, __int64 abStyle)
 void SelectionBox::removeMsStyle(
     int i, __int64 abStyle) // remove multistyle style
 {
-    if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
+    if (hasStyleNot(Style::MultiStyled) || i >= anzahl) return;
     if (!msStyle) msStyle = new Array<__int64>();
     msStyle->set(msStyle->get(i) & ~abStyle, i);
     rend = 1;
@@ -825,32 +825,32 @@ void SelectionBox::removeMsStyle(
 
 bool SelectionBox::tick(double tickVal) // tick
 {
-    if (ausgeklappt && ausfahren && !ausfahren->zText()->istGleich("/\\"))
+    if (ausgeklappt && ausfahren && !ausfahren->zText()->isEqual("/\\"))
     {
         ausfahren->setText("/\\");
         rend = 1;
     }
-    else if (!ausgeklappt && ausfahren && !ausfahren->zText()->istGleich("\\/"))
+    else if (!ausgeklappt && ausfahren && !ausfahren->zText()->isEqual("\\/"))
     {
         ausfahren->setText("\\/");
         rend = 1;
     }
-    if (hatStyleNicht(Style::Sichtbar) || hatStyleNicht(Style::Erlaubt))
+    if (hasStyleNot(Style::Visible) || hasStyleNot(Style::Allowed))
         ausgeklappt = 0;
     rend |= ausfahren->tick(tickVal);
     this->tickval += tickVal * 300;
     int val = (int)this->tickval;
     if (val < 1) return DrawableBackground::tick(tickVal);
     this->tickval -= val;
-    int maxHeight = rahmen ? rahmen->getRBreite() : 0;
-    if (hatStyleNicht(Style::MultiStyled))
-        maxHeight += anzahl * eintragHeight;
+    int maxHeight = border ? border->getRWidth() : 0;
+    if (hasStyleNot(Style::MultiStyled))
+        maxHeight += anzahl * entryHeight;
     else
         for (int i = 0; i < anzahl; ++i)
             maxHeight += members->z(i) ? members->z(i)->getHeight() : 0;
     if (maxHeight > ausklapMaxHeight)
     {
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
         {
             scrollAnzeigen = 1;
             vertikalScrollBar->update(maxHeight, ausklapMaxHeight);
@@ -879,7 +879,7 @@ bool SelectionBox::tick(double tickVal) // tick
     }
     for (int i = 0; i < anzahl; ++i)
     {
-        if (i != auswahl)
+        if (i != selection)
             rend |= members->z(i)->tick(tickVal);
         else
             members->z(i)->tick(tickVal);
@@ -889,39 +889,39 @@ bool SelectionBox::tick(double tickVal) // tick
 
 void SelectionBox::doKeyboardEvent(KeyboardEvent& te) // Keyboard
 {
-    if (te.verarbeitet || hatStyleNicht(Style::Fokus)
-        || hatStyleNicht(Style::Erlaubt))
+    if (te.processed || hasStyleNot(Style::Focus)
+        || hasStyleNot(Style::Allowed))
         return;
     if (te.id == TE_Release)
     {
         switch (te.virtualKey)
         {
         case T_Oben:
-            if (auswahl > 0)
-                --auswahl;
+            if (selection > 0)
+                --selection;
             else
-                auswahl = anzahl - 1;
-            if (eAk) eAk(eAkP, this, 0, auswahl);
-            scrollZuEintrag(auswahl);
+                selection = anzahl - 1;
+            if (eAk) eAk(eAkP, this, 0, selection);
+            scrollToEntry(selection);
             rend = 1;
             break;
         case T_Unten:
-            if (auswahl < anzahl - 1)
-                ++auswahl;
+            if (selection < anzahl - 1)
+                ++selection;
             else
-                auswahl = 0;
-            if (eAk) eAk(eAkP, this, 0, auswahl);
-            scrollZuEintrag(auswahl);
+                selection = 0;
+            if (eAk) eAk(eAkP, this, 0, selection);
+            scrollToEntry(selection);
             rend = 1;
             break;
         }
     }
-    if (te.verarbeitet && nTak) te.verarbeitet = nTak(ntakParam, this, te);
+    if (te.processed && nTak) te.processed = nTak(ntakParam, this, te);
 }
 
 void SelectionBox::render(Image& zRObj) // renders into zRObj
 {
-    if (hatStyle(Style::Sichtbar))
+    if (hasStyle(Style::Visible))
     {
         lockDrawable();
         int br = gr.x;
@@ -934,11 +934,11 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
             return;
         }
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) // Draw border
+        if (hasStyle(Style::Border) && border) // Draw border
         {
-            rahmen->setSize(br, hi);
-            rahmen->render(zRObj);
-            rbr = rahmen->getRBreite();
+            border->setSize(br, hi);
+            border->render(zRObj);
+            rbr = border->getRWidth();
         }
         if ((ausklappHeight
                 && !zRObj.setDrawOptionsErzwingen(
@@ -950,172 +950,172 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
             unlockDrawable();
             return;
         }
-        if (hatStyle(Style::Hintergrund))
+        if (hasStyle(Style::Background))
         {
-            if (hatStyle(Style::HAlpha))
-                zRObj.alphaRegion(0, 0, br, hi, hintergrundFarbe);
+            if (hasStyle(Style::HAlpha))
+                zRObj.alphaRegion(0, 0, br, hi, backgroundColor);
             else
-                zRObj.fillRegion(0, 0, br, hi, hintergrundFarbe);
-            if (hatStyle(Style::HImage) && hintergrundImage)
+                zRObj.fillRegion(0, 0, br, hi, backgroundColor);
+            if (hasStyle(Style::HImage) && backgroundImage)
             {
-                if (hatStyle(Style::HAlpha))
-                    zRObj.alphaImage(0, 0, br, hi, *hintergrundImage);
+                if (hasStyle(Style::HAlpha))
+                    zRObj.alphaImage(0, 0, br, hi, *backgroundImage);
                 else
-                    zRObj.drawImage(0, 0, br, hi, *hintergrundImage);
+                    zRObj.drawImage(0, 0, br, hi, *backgroundImage);
             }
         }
-        if (hatStyle(Style::Buffered) && hintergrundFeld)
+        if (hasStyle(Style::Buffered) && backgroundFeld)
         {
-            hintergrundFeld->setSize(br - rbr * 2, hi - rbr * 2);
-            hintergrundFeld->render(zRObj);
+            backgroundFeld->setSize(br - rbr * 2, hi - rbr * 2);
+            backgroundFeld->render(zRObj);
         }
         if (ausfahren) // Draw expand button
         {
             ausfahren->setSize(gr.y - rbr * 2, gr.y - rbr * 2);
-            ausfahren->setPosition(gr.x - rbr - ausfahren->getBreite(), rbr);
+            ausfahren->setPosition(gr.x - rbr - ausfahren->getWidth(), rbr);
             ausfahren->render(zRObj);
         }
         if (members) // Draw selected text field
         {
-            if (auswahl < 0)
+            if (selection < 0)
             {
-                auswahl = 0;
-                if (eAk) eAk(eAkP, this, 0, auswahl);
+                selection = 0;
+                if (eAk) eAk(eAkP, this, 0, selection);
             }
-            if (auswahl >= anzahl)
+            if (selection >= anzahl)
             {
-                auswahl = anzahl - 1;
-                if (eAk) eAk(eAkP, this, 0, auswahl);
+                selection = anzahl - 1;
+                if (eAk) eAk(eAkP, this, 0, selection);
             }
-            TextField* tf = auswahl >= 0 ? members->z(auswahl) : 0;
+            TextField* tf = selection >= 0 ? members->z(selection) : 0;
             if (tf)
             {
                 AlphaField* tmpBuffer = 0;
                 bool tmpB = 0;
-                int tmpHFarbe = 0;
+                int tmpHColor = 0;
                 bool tmpH = 0;
                 Image* tmpHImage = 0;
                 bool tmpHB = 0;
                 bool tmpHAlpha = 0;
                 Border* tmpBorder = 0;
                 bool tmpR = 0;
-                if (hatStyleNicht(Style::MultiStyled) || !msStyle)
+                if (hasStyleNot(Style::MultiStyled) || !msStyle)
                 {
-                    if (hatStyle(Style::AuswahlBuffer))
+                    if (hasStyle(Style::SelectionBuffer))
                     {
                         tmpBuffer = tf->getAlphaField();
                         tf->setAlphaFieldZ(
-                            dynamic_cast<AlphaField*>(auswAf->getThis()));
-                        tmpB = tf->hatStyle(TextField::Style::Buffered);
+                            dynamic_cast<AlphaField*>(selAf->getThis()));
+                        tmpB = tf->hasStyle(TextField::Style::Buffered);
                         tf->setStyle(TextField::Style::Buffered,
-                            hatStyle(Style::AuswahlBuffer));
+                            hasStyle(Style::SelectionBuffer));
                     }
-                    if (hatStyle(Style::AuswahlHintergrund))
+                    if (hasStyle(Style::SelectionBackground))
                     {
-                        tmpH = tf->hatStyle(TextField::Style::Hintergrund);
-                        tmpHFarbe = tf->getHintergrundFarbe();
-                        tf->setHintergrundFarbe(auswBgF);
-                        tf->setStyle(TextField::Style::Hintergrund,
-                            hatStyle(Style::Hintergrund));
-                        if (hatStyle(Style::AuswahlHImage))
+                        tmpH = tf->hasStyle(TextField::Style::Background);
+                        tmpHColor = tf->getBackgroundColor();
+                        tf->setBackgroundColor(selBgF);
+                        tf->setStyle(TextField::Style::Background,
+                            hasStyle(Style::Background));
+                        if (hasStyle(Style::SelectionHImage))
                         {
-                            tmpHImage = tf->getHintergrundImage();
-                            tf->setHintergrundImageZ(
-                                dynamic_cast<Image*>(auswBgB->getThis()));
-                            tmpHB = tf->hatStyle(TextField::Style::HImage);
+                            tmpHImage = tf->getBackgroundImage();
+                            tf->setBackgroundImageZ(
+                                dynamic_cast<Image*>(selBgB->getThis()));
+                            tmpHB = tf->hasStyle(TextField::Style::HImage);
                             tf->setStyle(
-                                TextField::Style::HImage, hatStyle(Style::HImage));
+                                TextField::Style::HImage, hasStyle(Style::HImage));
                         }
-                        if (hatStyle(Style::AuswahlHAlpha))
+                        if (hasStyle(Style::SelectionHAlpha))
                         {
-                            tmpHAlpha = tf->hatStyle(TextField::Style::HAlpha);
+                            tmpHAlpha = tf->hasStyle(TextField::Style::HAlpha);
                             tf->setStyle(TextField::Style::HAlpha,
-                                hatStyle(Style::AuswahlHAlpha));
+                                hasStyle(Style::SelectionHAlpha));
                         }
                     }
-                    if (hatStyle(Style::SelectionBorder))
+                    if (hasStyle(Style::SelectionBorder))
                     {
                         tmpBorder = tf->getBorder();
                         tf->setBorderZ(
                             dynamic_cast<Border*>(selBorder->getThis()));
-                        tmpR = tf->hatStyle(TextField::Style::Border);
+                        tmpR = tf->hasStyle(TextField::Style::Border);
                         tf->setStyle(TextField::Style::Border,
-                            hatStyle(Style::SelectionBorder));
+                            hasStyle(Style::SelectionBorder));
                     }
                 }
                 else
                 {
-                    if (hatMsStyle(auswahl, Style::AuswahlBuffer) && msAuswAf)
+                    if (hasMsStyle(selection, Style::SelectionBuffer) && msSelAf)
                     {
                         tmpBuffer = tf->getAlphaField();
-                        tf->setAlphaFieldZ(msAuswAf->get(auswahl));
-                        tmpB = tf->hatStyle(TextField::Style::Buffered);
+                        tf->setAlphaFieldZ(msSelAf->get(selection));
+                        tmpB = tf->hasStyle(TextField::Style::Buffered);
                         tf->setStyle(TextField::Style::Buffered,
-                            hatMsStyle(auswahl, Style::AuswahlBuffer));
+                            hasMsStyle(selection, Style::SelectionBuffer));
                     }
-                    if (hatMsStyle(auswahl, Style::AuswahlHintergrund))
+                    if (hasMsStyle(selection, Style::SelectionBackground))
                     {
-                        tmpH = tf->hatStyle(Style::Hintergrund);
-                        tf->setStyle(TextField::Style::Hintergrund,
-                            hatMsStyle(auswahl, Style::AuswahlHintergrund));
-                        if (msAuswBgF && msAuswBgF->hat(auswahl))
+                        tmpH = tf->hasStyle(Style::Background);
+                        tf->setStyle(TextField::Style::Background,
+                            hasMsStyle(selection, Style::SelectionBackground));
+                        if (msSelBgF && msSelBgF->has(selection))
                         {
-                            tmpHFarbe = tf->getHintergrundFarbe();
-                            tf->setHintergrundFarbe(msAuswBgF->get(auswahl));
+                            tmpHColor = tf->getBackgroundColor();
+                            tf->setBackgroundColor(msSelBgF->get(selection));
                         }
-                        if (hatMsStyle(auswahl, Style::AuswahlHImage)
-                            && msAuswBgB)
+                        if (hasMsStyle(selection, Style::SelectionHImage)
+                            && msSelBgB)
                         {
-                            tmpHImage = tf->getHintergrundImage();
-                            tf->setHintergrundImageZ(msAuswBgB->get(auswahl));
-                            tmpHB = tf->hatStyle(TextField::Style::HImage);
+                            tmpHImage = tf->getBackgroundImage();
+                            tf->setBackgroundImageZ(msSelBgB->get(selection));
+                            tmpHB = tf->hasStyle(TextField::Style::HImage);
                             tf->setStyle(TextField::Style::HImage,
-                                hatMsStyle(auswahl, Style::HImage));
+                                hasMsStyle(selection, Style::HImage));
                         }
-                        if (hatMsStyle(auswahl, Style::AuswahlHAlpha))
+                        if (hasMsStyle(selection, Style::SelectionHAlpha))
                         {
-                            tmpHAlpha = tf->hatStyle(TextField::Style::HAlpha);
+                            tmpHAlpha = tf->hasStyle(TextField::Style::HAlpha);
                             tf->setStyle(TextField::Style::HAlpha,
-                                hatMsStyle(auswahl, Style::AuswahlHAlpha));
+                                hasMsStyle(selection, Style::SelectionHAlpha));
                         }
                     }
-                    if (hatMsStyle(auswahl, Style::SelectionBorder)
+                    if (hasMsStyle(selection, Style::SelectionBorder)
                         && msSelBorder)
                     {
                         tmpBorder = tf->getBorder();
-                        tf->setBorderZ(msSelBorder->get(auswahl));
-                        tmpR = tf->hatStyle(TextField::Style::Border);
+                        tf->setBorderZ(msSelBorder->get(selection));
+                        tmpR = tf->hasStyle(TextField::Style::Border);
                         tf->setStyle(TextField::Style::Border,
-                            hatMsStyle(auswahl, Style::SelectionBorder));
+                            hasMsStyle(selection, Style::SelectionBorder));
                     }
                 }
                 int tmpHi = tf->getHeight();
                 tf->setPosition(0, 0);
                 tf->setSize(
-                    gr.x - rbr * 2 - (ausfahren ? ausfahren->getBreite() : 0),
+                    gr.x - rbr * 2 - (ausfahren ? ausfahren->getWidth() : 0),
                     gr.y - rbr * 2);
                 tf->render(zRObj);
-                tf->setSize(tf->getBreite(), tmpHi);
-                if (hatStyleNicht(Style::MultiStyled) || !msStyle)
+                tf->setSize(tf->getWidth(), tmpHi);
+                if (hasStyleNot(Style::MultiStyled) || !msStyle)
                 {
-                    if (hatStyle(Style::AuswahlBuffer))
+                    if (hasStyle(Style::SelectionBuffer))
                     {
                         tf->setAlphaFieldZ(tmpBuffer);
                         tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
-                    if (hatStyle(Style::AuswahlHintergrund))
+                    if (hasStyle(Style::SelectionBackground))
                     {
-                        tf->setHintergrundFarbe(tmpHFarbe);
-                        tf->setStyle(TextField::Style::Hintergrund, tmpH);
-                        if (hatStyle(Style::AuswahlHImage))
+                        tf->setBackgroundColor(tmpHColor);
+                        tf->setStyle(TextField::Style::Background, tmpH);
+                        if (hasStyle(Style::SelectionHImage))
                         {
-                            tf->setHintergrundImageZ(tmpHImage);
+                            tf->setBackgroundImageZ(tmpHImage);
                             tf->setStyle(TextField::Style::HImage, tmpHB);
                         }
-                        if (hatStyle(Style::AuswahlHAlpha))
+                        if (hasStyle(Style::SelectionHAlpha))
                             tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
                     }
-                    if (hatStyle(Style::SelectionBorder))
+                    if (hasStyle(Style::SelectionBorder))
                     {
                         tf->setBorderZ(tmpBorder);
                         tf->setStyle(TextField::Style::Border, tmpR);
@@ -1123,26 +1123,26 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                 }
                 else
                 {
-                    if (hatMsStyle(auswahl, Style::AuswahlBuffer) && msAuswAf)
+                    if (hasMsStyle(selection, Style::SelectionBuffer) && msSelAf)
                     {
                         tf->setAlphaFieldZ(tmpBuffer);
                         tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
-                    if (hatMsStyle(auswahl, Style::AuswahlHintergrund))
+                    if (hasMsStyle(selection, Style::SelectionBackground))
                     {
-                        tf->setStyle(TextField::Style::Hintergrund, tmpH);
-                        if (msAuswBgF && msAuswBgF->hat(auswahl))
-                            tf->setHintergrundFarbe(tmpHFarbe);
-                        if (hatMsStyle(auswahl, Style::AuswahlHImage)
-                            && msAuswBgB)
+                        tf->setStyle(TextField::Style::Background, tmpH);
+                        if (msSelBgF && msSelBgF->has(selection))
+                            tf->setBackgroundColor(tmpHColor);
+                        if (hasMsStyle(selection, Style::SelectionHImage)
+                            && msSelBgB)
                         {
-                            tf->setHintergrundImageZ(tmpHImage);
+                            tf->setBackgroundImageZ(tmpHImage);
                             tf->setStyle(TextField::Style::HImage, tmpHB);
                         }
-                        if (hatMsStyle(auswahl, Style::AuswahlHAlpha))
+                        if (hasMsStyle(selection, Style::SelectionHAlpha))
                             tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
                     }
-                    if (hatMsStyle(auswahl, Style::SelectionBorder)
+                    if (hasMsStyle(selection, Style::SelectionBorder)
                         && msSelBorder)
                     {
                         tf->setBorderZ(tmpBorder);
@@ -1152,11 +1152,11 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
             }
         }
         bool vsb
-            = hatStyle(Style::VScroll) && vertikalScrollBar; // Draw scroll bar
-        if (auswahl >= anzahl)
+            = hasStyle(Style::VScroll) && vertikalScrollBar; // Draw scroll bar
+        if (selection >= anzahl)
         {
-            auswahl = 0;
-            if (eAk) eAk(eAkP, this, 0, auswahl);
+            selection = 0;
+            if (eAk) eAk(eAkP, this, 0, selection);
         }
         if (members)
         {
@@ -1192,10 +1192,10 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                 tf->setPosition(0, dy);
                 tf->setSize(br - rbr * 2, tf->getHeight());
                 maxHeight += tf->getHeight();
-                bool selected = auswahl == i;
+                bool selected = selection == i;
                 AlphaField* tmpBuffer = 0;
                 bool tmpB = 0;
-                int tmpHFarbe = 0;
+                int tmpHColor = 0;
                 bool tmpH = 0;
                 Image* tmpHImage = 0;
                 bool tmpHB = 0;
@@ -1204,214 +1204,214 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                 bool tmpR = 0;
                 if (selected)
                 {
-                    if (hatStyleNicht(Style::MultiStyled) || !msStyle)
+                    if (hasStyleNot(Style::MultiStyled) || !msStyle)
                     {
-                        if (hatStyle(Style::AuswahlBuffer))
+                        if (hasStyle(Style::SelectionBuffer))
                         {
                             tmpBuffer = tf->getAlphaField();
                             tf->setAlphaFieldZ(
-                                dynamic_cast<AlphaField*>(auswAf->getThis()));
-                            tmpB = tf->hatStyle(TextField::Style::Buffered);
+                                dynamic_cast<AlphaField*>(selAf->getThis()));
+                            tmpB = tf->hasStyle(TextField::Style::Buffered);
                             tf->setStyle(TextField::Style::Buffered,
-                                hatStyle(Style::AuswahlBuffer));
+                                hasStyle(Style::SelectionBuffer));
                         }
-                        if (hatStyle(Style::AuswahlHintergrund))
+                        if (hasStyle(Style::SelectionBackground))
                         {
-                            tmpH = tf->hatStyle(TextField::Style::Hintergrund);
-                            tmpHFarbe = tf->getHintergrundFarbe();
-                            tf->setHintergrundFarbe(auswBgF);
-                            tf->setStyle(TextField::Style::Hintergrund,
-                                hatStyle(Style::Hintergrund));
-                            if (hatStyle(Style::AuswahlHImage))
+                            tmpH = tf->hasStyle(TextField::Style::Background);
+                            tmpHColor = tf->getBackgroundColor();
+                            tf->setBackgroundColor(selBgF);
+                            tf->setStyle(TextField::Style::Background,
+                                hasStyle(Style::Background));
+                            if (hasStyle(Style::SelectionHImage))
                             {
-                                tmpHImage = tf->getHintergrundImage();
-                                tf->setHintergrundImageZ(
-                                    dynamic_cast<Image*>(auswBgB->getThis()));
-                                tmpHB = tf->hatStyle(TextField::Style::HImage);
+                                tmpHImage = tf->getBackgroundImage();
+                                tf->setBackgroundImageZ(
+                                    dynamic_cast<Image*>(selBgB->getThis()));
+                                tmpHB = tf->hasStyle(TextField::Style::HImage);
                                 tf->setStyle(TextField::Style::HImage,
-                                    hatStyle(Style::HImage));
+                                    hasStyle(Style::HImage));
                             }
-                            if (hatStyle(Style::AuswahlHAlpha))
+                            if (hasStyle(Style::SelectionHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hatStyle(TextField::Style::HAlpha);
+                                    = tf->hasStyle(TextField::Style::HAlpha);
                                 tf->setStyle(TextField::Style::HAlpha,
-                                    hatStyle(Style::AuswahlHAlpha));
+                                    hasStyle(Style::SelectionHAlpha));
                             }
                         }
-                        if (hatStyle(Style::SelectionBorder))
+                        if (hasStyle(Style::SelectionBorder))
                         {
                             tmpBorder = tf->getBorder();
                             tf->setBorderZ(
                                 dynamic_cast<Border*>(selBorder->getThis()));
-                            tmpR = tf->hatStyle(TextField::Style::Border);
+                            tmpR = tf->hasStyle(TextField::Style::Border);
                             tf->setStyle(TextField::Style::Border,
-                                hatStyle(Style::SelectionBorder));
+                                hasStyle(Style::SelectionBorder));
                         }
                     }
                     else
                     {
-                        if (hatMsStyle(i, Style::AuswahlBuffer) && msAuswAf)
+                        if (hasMsStyle(i, Style::SelectionBuffer) && msSelAf)
                         {
                             tmpBuffer = tf->getAlphaField();
-                            tf->setAlphaFieldZ(msAuswAf->get(i));
-                            tmpB = tf->hatStyle(TextField::Style::Buffered);
+                            tf->setAlphaFieldZ(msSelAf->get(i));
+                            tmpB = tf->hasStyle(TextField::Style::Buffered);
                             tf->setStyle(TextField::Style::Buffered,
-                                hatMsStyle(i, Style::AuswahlBuffer));
+                                hasMsStyle(i, Style::SelectionBuffer));
                         }
-                        if (hatMsStyle(i, Style::AuswahlHintergrund))
+                        if (hasMsStyle(i, Style::SelectionBackground))
                         {
-                            tmpH = tf->hatStyle(Style::Hintergrund);
-                            tf->setStyle(TextField::Style::Hintergrund,
-                                hatMsStyle(i, Style::AuswahlHintergrund));
-                            if (msAuswBgF && msAuswBgF->hat(i))
+                            tmpH = tf->hasStyle(Style::Background);
+                            tf->setStyle(TextField::Style::Background,
+                                hasMsStyle(i, Style::SelectionBackground));
+                            if (msSelBgF && msSelBgF->has(i))
                             {
-                                tmpHFarbe = tf->getHintergrundFarbe();
-                                tf->setHintergrundFarbe(msAuswBgF->get(i));
+                                tmpHColor = tf->getBackgroundColor();
+                                tf->setBackgroundColor(msSelBgF->get(i));
                             }
-                            if (hatMsStyle(i, Style::AuswahlHImage) && msAuswBgB)
+                            if (hasMsStyle(i, Style::SelectionHImage) && msSelBgB)
                             {
-                                tmpHImage = tf->getHintergrundImage();
-                                tf->setHintergrundImageZ(msAuswBgB->get(i));
-                                tmpHB = tf->hatStyle(TextField::Style::HImage);
+                                tmpHImage = tf->getBackgroundImage();
+                                tf->setBackgroundImageZ(msSelBgB->get(i));
+                                tmpHB = tf->hasStyle(TextField::Style::HImage);
                                 tf->setStyle(TextField::Style::HImage,
-                                    hatMsStyle(i, Style::HImage));
+                                    hasMsStyle(i, Style::HImage));
                             }
-                            if (hatMsStyle(i, Style::AuswahlHAlpha))
+                            if (hasMsStyle(i, Style::SelectionHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hatStyle(TextField::Style::HAlpha);
+                                    = tf->hasStyle(TextField::Style::HAlpha);
                                 tf->setStyle(TextField::Style::HAlpha,
-                                    hatMsStyle(i, Style::AuswahlHAlpha));
+                                    hasMsStyle(i, Style::SelectionHAlpha));
                             }
                         }
-                        if (hatMsStyle(i, Style::SelectionBorder) && msSelBorder)
+                        if (hasMsStyle(i, Style::SelectionBorder) && msSelBorder)
                         {
                             tmpBorder = tf->getBorder();
                             tf->setBorderZ(msSelBorder->get(i));
-                            tmpR = tf->hatStyle(TextField::Style::Border);
+                            tmpR = tf->hasStyle(TextField::Style::Border);
                             tf->setStyle(TextField::Style::Border,
-                                hatMsStyle(i, Style::SelectionBorder));
+                                hasMsStyle(i, Style::SelectionBorder));
                         }
                     }
                 }
-                else if (mausEintrag == i)
+                else if (mouseEntry == i)
                 {
-                    if (hatStyleNicht(Style::MultiStyled) || !msStyle)
+                    if (hasStyleNot(Style::MultiStyled) || !msStyle)
                     {
-                        if (hatStyle(Style::MausBuffer))
+                        if (hasStyle(Style::MouseBuffer))
                         {
                             tmpBuffer = tf->getAlphaField();
                             tf->setAlphaFieldZ(
-                                dynamic_cast<AlphaField*>(mausAf->getThis()));
-                            tmpB = tf->hatStyle(TextField::Style::Buffered);
+                                dynamic_cast<AlphaField*>(mouseAf->getThis()));
+                            tmpB = tf->hasStyle(TextField::Style::Buffered);
                             tf->setStyle(TextField::Style::Buffered,
-                                hatStyle(Style::MausBuffer));
+                                hasStyle(Style::MouseBuffer));
                         }
-                        if (hatStyle(Style::MausHintergrund))
+                        if (hasStyle(Style::MouseBackground))
                         {
-                            tmpH = tf->hatStyle(TextField::Style::Hintergrund);
-                            tmpHFarbe = tf->getHintergrundFarbe();
-                            tf->setHintergrundFarbe(mausBgF);
-                            tf->setStyle(TextField::Style::Hintergrund,
-                                hatStyle(Style::Hintergrund));
-                            if (hatStyle(Style::MausHImage))
+                            tmpH = tf->hasStyle(TextField::Style::Background);
+                            tmpHColor = tf->getBackgroundColor();
+                            tf->setBackgroundColor(mouseBgF);
+                            tf->setStyle(TextField::Style::Background,
+                                hasStyle(Style::Background));
+                            if (hasStyle(Style::MouseHImage))
                             {
-                                tmpHImage = tf->getHintergrundImage();
-                                tf->setHintergrundImageZ(
-                                    dynamic_cast<Image*>(mausBgB->getThis()));
-                                tmpHB = tf->hatStyle(TextField::Style::HImage);
+                                tmpHImage = tf->getBackgroundImage();
+                                tf->setBackgroundImageZ(
+                                    dynamic_cast<Image*>(mouseBgB->getThis()));
+                                tmpHB = tf->hasStyle(TextField::Style::HImage);
                                 tf->setStyle(TextField::Style::HImage,
-                                    hatStyle(Style::HImage));
+                                    hasStyle(Style::HImage));
                             }
-                            if (hatStyle(Style::MausHAlpha))
+                            if (hasStyle(Style::MouseHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hatStyle(TextField::Style::HAlpha);
+                                    = tf->hasStyle(TextField::Style::HAlpha);
                                 tf->setStyle(TextField::Style::HAlpha,
-                                    hatStyle(Style::MausHAlpha));
+                                    hasStyle(Style::MouseHAlpha));
                             }
                         }
-                        if (hatStyle(Style::MausRahmen))
+                        if (hasStyle(Style::MouseBorder))
                         {
                             tmpBorder = tf->getBorder();
                             tf->setBorderZ(
                                 dynamic_cast<Border*>(mouseBorder->getThis()));
-                            tmpR = tf->hatStyle(TextField::Style::Border);
+                            tmpR = tf->hasStyle(TextField::Style::Border);
                             tf->setStyle(TextField::Style::Border,
-                                hatStyle(Style::MausRahmen));
+                                hasStyle(Style::MouseBorder));
                         }
                     }
                     else
                     {
-                        if (hatMsStyle(i, Style::MausBuffer) && msAuswAf)
+                        if (hasMsStyle(i, Style::MouseBuffer) && msSelAf)
                         {
                             tmpBuffer = tf->getAlphaField();
-                            tf->setAlphaFieldZ(msMausAf->get(i));
-                            tmpB = tf->hatStyle(TextField::Style::Buffered);
+                            tf->setAlphaFieldZ(msMouseAf->get(i));
+                            tmpB = tf->hasStyle(TextField::Style::Buffered);
                             tf->setStyle(TextField::Style::Buffered,
-                                hatMsStyle(i, Style::MausBuffer));
+                                hasMsStyle(i, Style::MouseBuffer));
                         }
-                        if (hatMsStyle(i, Style::MausHintergrund))
+                        if (hasMsStyle(i, Style::MouseBackground))
                         {
-                            tmpH = tf->hatStyle(Style::Hintergrund);
-                            tf->setStyle(TextField::Style::Hintergrund,
-                                hatMsStyle(i, Style::MausHintergrund));
-                            if (msMausBgF && msMausBgF->hat(i))
+                            tmpH = tf->hasStyle(Style::Background);
+                            tf->setStyle(TextField::Style::Background,
+                                hasMsStyle(i, Style::MouseBackground));
+                            if (msMouseBgF && msMouseBgF->has(i))
                             {
-                                tmpHFarbe = tf->getHintergrundFarbe();
-                                tf->setHintergrundFarbe(msMausBgF->get(i));
+                                tmpHColor = tf->getBackgroundColor();
+                                tf->setBackgroundColor(msMouseBgF->get(i));
                             }
-                            if (hatMsStyle(i, Style::MausHImage) && msMausBgB)
+                            if (hasMsStyle(i, Style::MouseHImage) && msMouseBgB)
                             {
-                                tmpHImage = tf->getHintergrundImage();
-                                tf->setHintergrundImageZ(msMausBgB->get(i));
-                                tmpHB = tf->hatStyle(TextField::Style::HImage);
+                                tmpHImage = tf->getBackgroundImage();
+                                tf->setBackgroundImageZ(msMouseBgB->get(i));
+                                tmpHB = tf->hasStyle(TextField::Style::HImage);
                                 tf->setStyle(TextField::Style::HImage,
-                                    hatMsStyle(i, Style::HImage));
+                                    hasMsStyle(i, Style::HImage));
                             }
-                            if (hatMsStyle(i, Style::MausHAlpha))
+                            if (hasMsStyle(i, Style::MouseHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hatStyle(TextField::Style::HAlpha);
+                                    = tf->hasStyle(TextField::Style::HAlpha);
                                 tf->setStyle(TextField::Style::HAlpha,
-                                    hatMsStyle(i, Style::MausHAlpha));
+                                    hasMsStyle(i, Style::MouseHAlpha));
                             }
                         }
-                        if (hatMsStyle(i, Style::MausRahmen) && msMouseBorder)
+                        if (hasMsStyle(i, Style::MouseBorder) && msMouseBorder)
                         {
                             tmpBorder = tf->getBorder();
                             tf->setBorderZ(msMouseBorder->get(i));
-                            tmpR = tf->hatStyle(TextField::Style::Border);
+                            tmpR = tf->hasStyle(TextField::Style::Border);
                             tf->setStyle(TextField::Style::Border,
-                                hatMsStyle(i, Style::MausRahmen));
+                                hasMsStyle(i, Style::MouseBorder));
                         }
                     }
                 }
                 tf->render(zRObj);
                 if (selected)
                 {
-                    if (hatStyleNicht(Style::MultiStyled) || !msStyle)
+                    if (hasStyleNot(Style::MultiStyled) || !msStyle)
                     {
-                        if (hatStyle(Style::AuswahlBuffer))
+                        if (hasStyle(Style::SelectionBuffer))
                         {
                             tf->setAlphaFieldZ(tmpBuffer);
                             tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
-                        if (hatStyle(Style::AuswahlHintergrund))
+                        if (hasStyle(Style::SelectionBackground))
                         {
-                            tf->setHintergrundFarbe(tmpHFarbe);
-                            tf->setStyle(TextField::Style::Hintergrund, tmpH);
-                            if (hatStyle(Style::AuswahlHImage))
+                            tf->setBackgroundColor(tmpHColor);
+                            tf->setStyle(TextField::Style::Background, tmpH);
+                            if (hasStyle(Style::SelectionHImage))
                             {
-                                tf->setHintergrundImageZ(tmpHImage);
+                                tf->setBackgroundImageZ(tmpHImage);
                                 tf->setStyle(TextField::Style::HImage, tmpHB);
                             }
-                            if (hatStyle(Style::AuswahlHAlpha))
+                            if (hasStyle(Style::SelectionHAlpha))
                                 tf->setStyle(
                                     TextField::Style::HAlpha, tmpHAlpha);
                         }
-                        if (hatStyle(Style::SelectionBorder))
+                        if (hasStyle(Style::SelectionBorder))
                         {
                             tf->setBorderZ(tmpBorder);
                             tf->setStyle(TextField::Style::Border, tmpR);
@@ -1419,55 +1419,55 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                     }
                     else
                     {
-                        if (hatMsStyle(i, Style::AuswahlBuffer) && msAuswAf)
+                        if (hasMsStyle(i, Style::SelectionBuffer) && msSelAf)
                         {
                             tf->setAlphaFieldZ(tmpBuffer);
                             tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
-                        if (hatMsStyle(i, Style::AuswahlHintergrund))
+                        if (hasMsStyle(i, Style::SelectionBackground))
                         {
-                            tf->setStyle(TextField::Style::Hintergrund, tmpH);
-                            if (msAuswBgF && msAuswBgF->hat(i))
-                                tf->setHintergrundFarbe(tmpHFarbe);
-                            if (hatMsStyle(i, Style::AuswahlHImage) && msAuswBgB)
+                            tf->setStyle(TextField::Style::Background, tmpH);
+                            if (msSelBgF && msSelBgF->has(i))
+                                tf->setBackgroundColor(tmpHColor);
+                            if (hasMsStyle(i, Style::SelectionHImage) && msSelBgB)
                             {
-                                tf->setHintergrundImageZ(tmpHImage);
+                                tf->setBackgroundImageZ(tmpHImage);
                                 tf->setStyle(TextField::Style::HImage, tmpHB);
                             }
-                            if (hatMsStyle(i, Style::AuswahlHAlpha))
+                            if (hasMsStyle(i, Style::SelectionHAlpha))
                                 tf->setStyle(
                                     TextField::Style::HAlpha, tmpHAlpha);
                         }
-                        if (hatMsStyle(i, Style::SelectionBorder) && msSelBorder)
+                        if (hasMsStyle(i, Style::SelectionBorder) && msSelBorder)
                         {
                             tf->setBorderZ(tmpBorder);
                             tf->setStyle(TextField::Style::Border, tmpR);
                         }
                     }
                 }
-                else if (mausEintrag == i)
+                else if (mouseEntry == i)
                 {
-                    if (hatStyleNicht(Style::MultiStyled) || !msStyle)
+                    if (hasStyleNot(Style::MultiStyled) || !msStyle)
                     {
-                        if (hatStyle(Style::MausBuffer))
+                        if (hasStyle(Style::MouseBuffer))
                         {
                             tf->setAlphaFieldZ(tmpBuffer);
                             tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
-                        if (hatStyle(Style::MausHintergrund))
+                        if (hasStyle(Style::MouseBackground))
                         {
-                            tf->setHintergrundFarbe(tmpHFarbe);
-                            tf->setStyle(TextField::Style::Hintergrund, tmpH);
-                            if (hatStyle(Style::MausHImage))
+                            tf->setBackgroundColor(tmpHColor);
+                            tf->setStyle(TextField::Style::Background, tmpH);
+                            if (hasStyle(Style::MouseHImage))
                             {
-                                tf->setHintergrundImageZ(tmpHImage);
+                                tf->setBackgroundImageZ(tmpHImage);
                                 tf->setStyle(TextField::Style::HImage, tmpHB);
                             }
-                            if (hatStyle(Style::MausHAlpha))
+                            if (hasStyle(Style::MouseHAlpha))
                                 tf->setStyle(
                                     TextField::Style::HAlpha, tmpHAlpha);
                         }
-                        if (hatStyle(Style::MausRahmen))
+                        if (hasStyle(Style::MouseBorder))
                         {
                             tf->setBorderZ(tmpBorder);
                             tf->setStyle(TextField::Style::Border, tmpR);
@@ -1475,26 +1475,26 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
                     }
                     else
                     {
-                        if (hatMsStyle(i, Style::MausBuffer) && msAuswAf)
+                        if (hasMsStyle(i, Style::MouseBuffer) && msSelAf)
                         {
                             tf->setAlphaFieldZ(tmpBuffer);
                             tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
-                        if (hatMsStyle(i, Style::MausHintergrund))
+                        if (hasMsStyle(i, Style::MouseBackground))
                         {
-                            tf->setStyle(TextField::Style::Hintergrund, tmpH);
-                            if (msAuswBgF && msAuswBgF->hat(i))
-                                tf->setHintergrundFarbe(tmpHFarbe);
-                            if (hatMsStyle(i, Style::MausHImage) && msAuswBgB)
+                            tf->setStyle(TextField::Style::Background, tmpH);
+                            if (msSelBgF && msSelBgF->has(i))
+                                tf->setBackgroundColor(tmpHColor);
+                            if (hasMsStyle(i, Style::MouseHImage) && msSelBgB)
                             {
-                                tf->setHintergrundImageZ(tmpHImage);
+                                tf->setBackgroundImageZ(tmpHImage);
                                 tf->setStyle(TextField::Style::HImage, tmpHB);
                             }
-                            if (hatMsStyle(i, Style::MausHAlpha))
+                            if (hasMsStyle(i, Style::MouseHAlpha))
                                 tf->setStyle(
                                     TextField::Style::HAlpha, tmpHAlpha);
                         }
-                        if (hatMsStyle(i, Style::MausRahmen) && msSelBorder)
+                        if (hasMsStyle(i, Style::MouseBorder) && msSelBorder)
                         {
                             tf->setBorderZ(tmpBorder);
                             tf->setStyle(TextField::Style::Border, tmpR);
@@ -1514,19 +1514,19 @@ void SelectionBox::render(Image& zRObj) // renders into zRObj
 }
 
 // constant
-int SelectionBox::getEintragPos(
+int SelectionBox::getEntryPos(
     const char* txt) const // returns the entry position
 {
     for (int i = 0; i < anzahl; ++i)
-        if (members->z(i) && members->z(i)->zText()->istGleich(txt)) return i;
+        if (members->z(i) && members->z(i)->zText()->isEqual(txt)) return i;
     return -1;
 }
 
-int SelectionBox::getEintragPos(Text* txt) const
+int SelectionBox::getEntryPos(Text* txt) const
 {
     for (int i = 0; i < anzahl; ++i)
     {
-        if (members->z(i) && members->z(i)->zText()->istGleich(txt->getText()))
+        if (members->z(i) && members->z(i)->zText()->isEqual(txt->getText()))
         {
             txt->release();
             return i;
@@ -1536,33 +1536,33 @@ int SelectionBox::getEintragPos(Text* txt) const
     return -1;
 }
 
-Text* SelectionBox::getEintragText(int i) const // returns the entry text
+Text* SelectionBox::getEntryText(int i) const // returns the entry text
 {
     if (i >= anzahl) return 0;
     return members->z(i) ? members->z(i)->getText() : 0;
 }
 
-Text* SelectionBox::zEintragText(int i) const
+Text* SelectionBox::zEntryText(int i) const
 {
     if (i >= anzahl) return 0;
     return members->z(i) ? members->z(i)->zText() : 0;
 }
 
-TextField* SelectionBox::getEintrag(int i) const // returns the entry
+TextField* SelectionBox::getEntry(int i) const // returns the entry
 {
     if (i >= anzahl) return 0;
     return members->get(i);
 }
 
-TextField* SelectionBox::zEintrag(int i) const
+TextField* SelectionBox::zEntry(int i) const
 {
     if (i >= anzahl) return 0;
     return members->z(i);
 }
 
-int SelectionBox::getAuswahl() const // returns the position of the selected entry
+int SelectionBox::getSelection() const // returns the position of the selected entry
 {
-    return auswahl;
+    return selection;
 }
 
 int SelectionBox::getEntryCount() const // returns the number of entries
@@ -1570,61 +1570,61 @@ int SelectionBox::getEntryCount() const // returns the number of entries
     return anzahl;
 }
 
-bool SelectionBox::istAusgeklappt() const // checks if the list is expanded
+bool SelectionBox::isExpanded() const // checks if the list is expanded
 {
     return ausgeklappt;
 }
 
 int SelectionBox::getMaxHeight() const // returns the maximum list height
 {
-    if (!hatStyle(Style::MaxHeight)) return 0;
+    if (!hasStyle(Style::MaxHeight)) return 0;
     return ausklapMaxHeight;
 }
 
-int SelectionBox::getEintragHeight() const // returns the height of the entries
+int SelectionBox::getEntryHeight() const // returns the height of the entries
 {
-    return eintragHeight;
+    return entryHeight;
 }
 
 Button*
 SelectionBox::getDropDownButton() const // returns the expand/collapse button
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
     return ausfahren ? dynamic_cast<Button*>(ausfahren->getThis()) : 0;
 }
 
 Button* SelectionBox::zDropDownButton() const
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
     return ausfahren;
 }
 
 Border* SelectionBox::getEntryBorder(int i) const // returns the entry border
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->getBorder();
 }
 
 Border* SelectionBox::zEntryBorder(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->zBorder();
 }
 
-int SelectionBox::getEintragRahmenFarbe(
+int SelectionBox::getEntryBorderColor(
     int i) const // returns the entry border color
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->getBorderColor();
 }
 
-int SelectionBox::getEintragRahmenBreite(
+int SelectionBox::getEntryBorderWidth(
     int i) const // returns the entry border width
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->getBorderWidth();
 }
@@ -1632,133 +1632,133 @@ int SelectionBox::getEintragRahmenBreite(
 AlphaField* SelectionBox::getEntryAlphaField(
     int i) const // returns the entry AlphaField
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->getAlphaField();
 }
 
 AlphaField* SelectionBox::zEntryAlphaField(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->zAlphaField();
 }
 
-int SelectionBox::getEintragAlphaFeldFarbe(
+int SelectionBox::getEntryAlphaFieldColor(
     int i) const // returns the entry AlphaField color
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->getAlphaFieldColor();
 }
 
-int SelectionBox::getEintragAlphaFeldStrength(
+int SelectionBox::getEntryAlphaFieldStrength(
     int i) const // returns the entry AlphaField strength
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
     return members->z(i)->getAlphaFieldStrength();
 }
 
-int SelectionBox::getEintragHintergrundFarbe(
+int SelectionBox::getEntryBackgroundColor(
     int i) const // returns the entry background color
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getHintergrundFarbe();
+    return members->z(i)->getBackgroundColor();
 }
 
-Image* SelectionBox::getEintragHintergrundImage(
+Image* SelectionBox::getEntryBackgroundImage(
     int i) const // returns the entry background image
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getHintergrundImage();
+    return members->z(i)->getBackgroundImage();
 }
 
-Image* SelectionBox::zEintragHintergrundImage(int i) const
+Image* SelectionBox::zEntryBackgroundImage(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->zHintergrundImage();
+    return members->z(i)->zBackgroundImage();
 }
 
 Border* SelectionBox::getSelBorder() const // returns the selection border
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
     return selBorder ? dynamic_cast<Border*>(selBorder->getThis()) : 0;
 }
 
 Border* SelectionBox::zSelBorder() const
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
     return selBorder;
 }
 
-int SelectionBox::getAuswRahmenFarbe() const // returns the selection border color
+int SelectionBox::getSelBorderColor() const // returns the selection border color
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return selBorder ? selBorder->getFarbe() : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selBorder ? selBorder->getColor() : 0;
 }
 
-int SelectionBox::getAuswRahmenBreite()
+int SelectionBox::getSelBorderWidth()
     const // returns the selection border width
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return selBorder ? selBorder->getRBreite() : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selBorder ? selBorder->getRWidth() : 0;
 }
 
 AlphaField*
 SelectionBox::getSelAlphaField() const // returns the selection AlphaField
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return auswAf ? dynamic_cast<AlphaField*>(auswAf->getThis()) : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selAf ? dynamic_cast<AlphaField*>(selAf->getThis()) : 0;
 }
 
 AlphaField* SelectionBox::zSelAlphaField() const
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return auswAf;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selAf;
 }
 
-int SelectionBox::getAuswAlphaFeldFarbe()
+int SelectionBox::getSelAlphaFieldColor()
     const // returns the selection AlphaField color
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return auswAf ? auswAf->getFarbe() : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selAf ? selAf->getColor() : 0;
 }
 
-int SelectionBox::getAuswAlphaFeldStrength()
+int SelectionBox::getSelAlphaFieldStrength()
     const // returns the selection AlphaField strength
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return auswAf ? auswAf->getStrength() : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selAf ? selAf->getStrength() : 0;
 }
 
-int SelectionBox::getAuswHintergrundFarbe()
+int SelectionBox::getSelBackgroundColor()
     const // returns the selection background color
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return auswBgF;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selBgF;
 }
 
-Image* SelectionBox::getAuswHintergrundImage()
+Image* SelectionBox::getSelBackgroundImage()
     const // returns the selection background image
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return auswBgB ? dynamic_cast<Image*>(auswBgB->getThis()) : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selBgB ? dynamic_cast<Image*>(selBgB->getThis()) : 0;
 }
 
-Image* SelectionBox::zAuswHintergrundImage() const
+Image* SelectionBox::zSelBackgroundImage() const
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return auswBgB;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return selBgB;
 }
 
 Border* SelectionBox::getMsSelBorder(
     int i) const // returns the multistyle selection border
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!msSelBorder) return 0;
     return msSelBorder->z(i)
              ? dynamic_cast<Border*>(msSelBorder->z(i)->getThis())
@@ -1767,264 +1767,264 @@ Border* SelectionBox::getMsSelBorder(
 
 Border* SelectionBox::zMsSelBorder(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!msSelBorder) return 0;
     return msSelBorder->z(i);
 }
 
-int SelectionBox::getMsAuswRahmenFarbe(
+int SelectionBox::getMsSelBorderColor(
     int i) const // returns the multistyle selection border color
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!msSelBorder) return 0;
-    return msSelBorder->z(i) ? msSelBorder->z(i)->getFarbe() : 0;
+    return msSelBorder->z(i) ? msSelBorder->z(i)->getColor() : 0;
 }
 
-int SelectionBox::getMsAuswRahmenBreite(
+int SelectionBox::getMsSelBorderWidth(
     int i) const // returns the multistyle selection border width
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!msSelBorder) return 0;
-    return msSelBorder->z(i) ? msSelBorder->z(i)->getRBreite() : 0;
+    return msSelBorder->z(i) ? msSelBorder->z(i)->getRWidth() : 0;
 }
 
 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<AlphaField*>(msAuswAf->z(i)->getThis())
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msSelAf) return 0;
+    return msSelAf->z(i) ? dynamic_cast<AlphaField*>(msSelAf->z(i)->getThis())
                           : 0;
 }
 
 AlphaField* SelectionBox::zMsSelAlphaField(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msAuswAf) return 0;
-    return msAuswAf->z(i);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msSelAf) return 0;
+    return msSelAf->z(i);
 }
 
-int SelectionBox::getMsAuswAlphaFeldFarbe(
+int SelectionBox::getMsSelAlphaFieldColor(
     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;
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msSelAf) return 0;
+    return msSelAf->z(i) ? msSelAf->z(i)->getColor() : 0;
 }
 
-int SelectionBox::getMsAuswAlphaFeldStrength(
+int SelectionBox::getMsSelAlphaFieldStrength(
     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;
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msSelAf) return 0;
+    return msSelAf->z(i) ? msSelAf->z(i)->getStrength() : 0;
 }
 
-int SelectionBox::getMsAuswHintergrundFarbe(
+int SelectionBox::getMsSelBackgroundColor(
     int i) const // returns the multistyle selection background color
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msAuswBgF || !msAuswBgF->hat(i)) return 0;
-    return msAuswBgF->get(i);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msSelBgF || !msSelBgF->has(i)) return 0;
+    return msSelBgF->get(i);
 }
 
-Image* SelectionBox::getMsAuswHintergrundImage(
+Image* SelectionBox::getMsSelBackgroundImage(
     int i) const // returns the multistyle selection background image
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msAuswBgB) return 0;
-    return msAuswBgB->get(i);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msSelBgB) return 0;
+    return msSelBgB->get(i);
 }
 
-Image* SelectionBox::zMsAuswHintergrundImage(int i) const
+Image* SelectionBox::zMsSelBackgroundImage(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msAuswBgB) return 0;
-    return msAuswBgB->z(i);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msSelBgB) return 0;
+    return msSelBgB->z(i);
 }
 
 Border* SelectionBox::getMouseBorder() const // returns the mouse border
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
     return mouseBorder ? dynamic_cast<Border*>(mouseBorder->getThis()) : 0;
 }
 
 Border* SelectionBox::zMouseBorder() const
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
     return mouseBorder;
 }
 
-int SelectionBox::getMausRahmenFarbe() const // returns the mouse border color
+int SelectionBox::getMouseBorderColor() const // returns the mouse border color
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mouseBorder ? mouseBorder->getFarbe() : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseBorder ? mouseBorder->getColor() : 0;
 }
 
-int SelectionBox::getMausRahmenBreite() const // returns the mouse border width
+int SelectionBox::getMouseBorderWidth() const // returns the mouse border width
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mouseBorder ? mouseBorder->getRBreite() : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseBorder ? mouseBorder->getRWidth() : 0;
 }
 
 AlphaField* SelectionBox::getMouseAlphaField() const // returns the mouse AlphaField
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mausAf ? dynamic_cast<AlphaField*>(mausAf->getThis()) : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseAf ? dynamic_cast<AlphaField*>(mouseAf->getThis()) : 0;
 }
 
 AlphaField* SelectionBox::zMouseAlphaField() const
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mausAf;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseAf;
 }
 
-int SelectionBox::getMausAlphaFeldFarbe()
+int SelectionBox::getMouseAlphaFieldColor()
     const // returns the mouse AlphaField color
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mausAf ? mausAf->getFarbe() : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseAf ? mouseAf->getColor() : 0;
 }
 
-int SelectionBox::getMausAlphaFeldStrength()
+int SelectionBox::getMouseAlphaFieldStrength()
     const // returns the mouse AlphaField strength
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mausAf ? mausAf->getStrength() : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseAf ? mouseAf->getStrength() : 0;
 }
 
-int SelectionBox::getMausHintergrundFarbe()
+int SelectionBox::getMouseBackgroundColor()
     const // returns the mouse background color
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mausBgF;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseBgF;
 }
 
-Image* SelectionBox::getMausHintergrundImage()
+Image* SelectionBox::getMouseBackgroundImage()
     const // returns the mouse background image
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mausBgB ? dynamic_cast<Image*>(mausBgB->getThis()) : 0;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseBgB ? dynamic_cast<Image*>(mouseBgB->getThis()) : 0;
 }
 
-Image* SelectionBox::zMausHintergrundImage() const
+Image* SelectionBox::zMouseBackgroundImage() const
 {
-    if (hatStyle(Style::MultiStyled)) return 0;
-    return mausBgB;
+    if (hasStyle(Style::MultiStyled)) return 0;
+    return mouseBgB;
 }
 
 Border* SelectionBox::getMsMouseBorder(
     int i) const // returns the multistyle mouse border
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!msMouseBorder) return 0;
     return msMouseBorder->get(i);
 }
 
 Border* SelectionBox::zMsMouseBorder(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!msMouseBorder) return 0;
     return msMouseBorder->z(i);
 }
 
-int SelectionBox::getMsMausRahmenFarbe(
+int SelectionBox::getMsMouseBorderColor(
     int i) const // returns the multistyle mouse border color
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!msMouseBorder) return 0;
-    return msMouseBorder->z(i) ? msMouseBorder->z(i)->getFarbe() : 0;
+    return msMouseBorder->z(i) ? msMouseBorder->z(i)->getColor() : 0;
 }
 
-int SelectionBox::getMsMausRahmenBreite(
+int SelectionBox::getMsMouseBorderWidth(
     int i) const // returns the multistyle mouse border width
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
+    if (!hasStyle(Style::MultiStyled)) return 0;
     if (!msMouseBorder) return 0;
-    return msMouseBorder->z(i) ? msMouseBorder->z(i)->getRBreite() : 0;
+    return msMouseBorder->z(i) ? msMouseBorder->z(i)->getRWidth() : 0;
 }
 
 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);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msMouseAf) return 0;
+    return msMouseAf->get(i);
 }
 
 AlphaField* SelectionBox::zMsMouseAlphaField(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msMausAf) return 0;
-    return msMausAf->z(i);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msMouseAf) return 0;
+    return msMouseAf->z(i);
 }
 
-int SelectionBox::getMsMausAlphaFeldFarbe(
+int SelectionBox::getMsMouseAlphaFieldColor(
     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;
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msMouseAf) return 0;
+    return msMouseAf->z(i) ? msMouseAf->z(i)->getColor() : 0;
 }
 
-int SelectionBox::getMsMausAlphaFeldStrength(
+int SelectionBox::getMsMouseAlphaFieldStrength(
     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;
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msMouseAf) return 0;
+    return msMouseAf->z(i) ? msMouseAf->z(i)->getStrength() : 0;
 }
 
-int SelectionBox::getMsMausHintergrundFarbe(
+int SelectionBox::getMsMouseBackgroundColor(
     int i) const // returns the multistyle mouse background color
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msMausBgF || !msMausBgF->hat(i)) return 0;
-    return msMausBgF->get(i);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msMouseBgF || !msMouseBgF->has(i)) return 0;
+    return msMouseBgF->get(i);
 }
 
-Image* SelectionBox::getMsMausHintergrundImage(
+Image* SelectionBox::getMsMouseBackgroundImage(
     int i) const // returns the multistyle mouse background image
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msMausBgB) return 0;
-    return msMausBgB->get(i);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msMouseBgB) return 0;
+    return msMouseBgB->get(i);
 }
 
-Image* SelectionBox::zMsMausHintergrundImage(int i) const
+Image* SelectionBox::zMsMouseBackgroundImage(int i) const
 {
-    if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msMausBgB) return 0;
-    return msMausBgB->z(i);
+    if (!hasStyle(Style::MultiStyled)) return 0;
+    if (!msMouseBgB) return 0;
+    return msMouseBgB->z(i);
 }
 
 // Checks if a point is inside this object
 //  x: the x coordinate of the point
 //  y: the y coordinate of the point
 //  return: 1 if the point is inside, 0 otherwise
-bool SelectionBox::istPunktInnen(int x, int y) const
+bool SelectionBox::isPointInside(int x, int y) const
 {
     return x >= pos.x && x < pos.x + gr.x && y >= pos.y
         && y < pos.y + gr.y + ausklappHeight;
 }
 
-bool SelectionBox::hatMsStyle(
+bool SelectionBox::hasMsStyle(
     int i, __int64 abStyle) const // checks if multistyle style is present
 {
-    if ((style | Style::MultiStyled) != style || !msStyle || !msStyle->hat(i))
+    if ((style | Style::MultiStyled) != style || !msStyle || !msStyle->has(i))
         return 0;
     return (msStyle->get(i) | abStyle) == msStyle->get(i);
 }
 
-bool SelectionBox::hatMsStyleNicht(
+bool SelectionBox::hasMsStyleNot(
     int i, __int64 abStyle) const // checks if multistyle style is not present
 {
-    if ((style | Style::MultiStyled) != style || !msStyle || !msStyle->hat(i))
+    if ((style | Style::MultiStyled) != style || !msStyle || !msStyle->has(i))
         return 1;
     return (msStyle->get(i) | abStyle) != msStyle->get(i);
 }
 
-Drawable* SelectionBox::dublizieren() const // Creates a copy of the drawing
+Drawable* SelectionBox::duplicate() const // Creates a copy of the drawing
 {
     SelectionBox* obj = new SelectionBox();
     obj->setPosition(pos);
@@ -2033,59 +2033,59 @@ Drawable* SelectionBox::dublizieren() const // Creates a copy of the drawing
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setStyle(style);
     if (textRd)
         obj->setTextRendererZ(dynamic_cast<TextRenderer*>(textRd->getThis()));
-    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
-    if (ausfahren) obj->setDropDownButtonZ((Button*)ausfahren->dublizieren());
-    obj->setHintergrundFarbe(hintergrundFarbe);
-    if (hintergrundImage)
-        obj->setHintergrundImage(
-            dynamic_cast<Image*>(hintergrundImage->getThis()));
-    if (hintergrundFeld)
-        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->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->setMouseAlphaFieldZ((AlphaField*)mausAf->dublizieren());
+    if (border) obj->setBorderZ((Border*)border->duplicate());
+    if (ausfahren) obj->setDropDownButtonZ((Button*)ausfahren->duplicate());
+    obj->setBackgroundColor(backgroundColor);
+    if (backgroundImage)
+        obj->setBackgroundImage(
+            dynamic_cast<Image*>(backgroundImage->getThis()));
+    if (backgroundFeld)
+        obj->setAlphaFieldZ((AlphaField*)backgroundFeld->duplicate());
+    if (selBorder) obj->setSelBorderZ((Border*)selBorder->duplicate());
+    obj->setSelBackgroundColor(selBgF);
+    if (selBgB)
+        obj->setSelBackgroundImage(dynamic_cast<Image*>(selBgB->getThis()));
+    if (selAf) obj->setSelAlphaFieldZ((AlphaField*)selAf->duplicate());
+    if (mouseBorder) obj->setMouseBorderZ((Border*)mouseBorder->duplicate());
+    obj->setMouseBackgroundColor(mouseBgF);
+    if (mouseBgB)
+        obj->setMouseBackgroundImage(dynamic_cast<Image*>(mouseBgB->getThis()));
+    if (mouseAf) obj->setMouseAlphaFieldZ((AlphaField*)mouseAf->duplicate());
     obj->setMaxAuskappHeight(ausklapMaxHeight);
-    obj->setEintragHeight(eintragHeight);
+    obj->setEntryHeight(entryHeight);
     for (int i = 0; i < anzahl; ++i)
     {
         if (members->z(i))
         {
-            obj->addEintrag("a");
-            obj->setEintragZ(i, (TextField*)members->z(i)->dublizieren());
-            if (msStyle && msStyle->hat(i)) obj->setMsStyle(i, msStyle->get(i));
+            obj->addEntry("a");
+            obj->setEntryZ(i, (TextField*)members->z(i)->duplicate());
+            if (msStyle && msStyle->has(i)) obj->setMsStyle(i, msStyle->get(i));
             if (msSelBorder && msSelBorder->z(i))
                 obj->setMsSelBorderZ(
-                    i, (Border*)msSelBorder->z(i)->dublizieren());
-            if (msAuswBgF && msAuswBgF->hat(i))
-                obj->setMsAuswHintergrundFarbe(i, msAuswBgF->get(i));
-            if (msAuswBgB && msAuswBgB->z(i))
-                obj->setMsAuswHintergrundImage(i, msAuswBgB->get(i));
-            if (msAuswAf && msAuswAf->z(i))
+                    i, (Border*)msSelBorder->z(i)->duplicate());
+            if (msSelBgF && msSelBgF->has(i))
+                obj->setMsSelBackgroundColor(i, msSelBgF->get(i));
+            if (msSelBgB && msSelBgB->z(i))
+                obj->setMsSelBackgroundImage(i, msSelBgB->get(i));
+            if (msSelAf && msSelAf->z(i))
                 obj->setMsSelAlphaFieldZ(
-                    i, (AlphaField*)msAuswAf->z(i)->dublizieren());
+                    i, (AlphaField*)msSelAf->z(i)->duplicate());
             if (msMouseBorder && msMouseBorder->z(i))
                 obj->setMsMouseBorderZ(
-                    i, (Border*)msMouseBorder->z(i)->dublizieren());
-            if (msMausBgF && msMausBgF->hat(i))
-                obj->setMsMausHintergrundFarbe(i, msMausBgF->get(i));
-            if (msMausBgB && msMausBgB->z(i))
-                obj->setMsMausHintergrundImage(i, msMausBgB->get(i));
-            if (msMausAf && msMausAf->z(i))
+                    i, (Border*)msMouseBorder->z(i)->duplicate());
+            if (msMouseBgF && msMouseBgF->has(i))
+                obj->setMsMouseBackgroundColor(i, msMouseBgF->get(i));
+            if (msMouseBgB && msMouseBgB->z(i))
+                obj->setMsMouseBackgroundImage(i, msMouseBgB->get(i));
+            if (msMouseAf && msMouseAf->z(i))
                 obj->setMsMouseAlphaFieldZ(
-                    i, (AlphaField*)msMausAf->z(i)->dublizieren());
+                    i, (AlphaField*)msMouseAf->z(i)->duplicate());
         }
     }
-    obj->setAlphaFieldColor(auswahl);
+    obj->setAlphaFieldColor(selection);
     return obj;
 }

SelectionBox.h

@@ -26,28 +26,28 @@ namespace Framework
             //! If this flag is set, each value in the list has a border
             static const __int64 FieldBorder = 0x000001000;
             //! If this flag is set, each value in the list has a background
-            static const __int64 FeldHintergrund = 0x000002000;
+            static const __int64 FieldBackground = 0x000002000;
             //! If this flag is set, each value in the list has an image
             //! as background
-            static const __int64 FeldHImage = 0x000004000;
+            static const __int64 FieldHImage = 0x000004000;
             //! If this flag is set, each value in the list has a
             //! transparent background
-            static const __int64 FeldHAlpha = 0x000008000;
+            static const __int64 FieldHAlpha = 0x000008000;
             //! If this flag is set, each value in the list has a
             //! color gradient
-            static const __int64 FeldBuffer = 0x000010000;
+            static const __int64 FieldBuffer = 0x000010000;
             //! If this flag is set, the currently selected value
             //! gets a background
-            static const __int64 AuswahlHintergrund = 0x000020000;
+            static const __int64 SelectionBackground = 0x000020000;
             //! If this flag is set, the currently selected value
             //! gets a background image
-            static const __int64 AuswahlHImage = 0x000040000;
+            static const __int64 SelectionHImage = 0x000040000;
             //! If this flag is set, the currently selected value
             //! gets a transparent background
-            static const __int64 AuswahlHAlpha = 0x000080000;
+            static const __int64 SelectionHAlpha = 0x000080000;
             //! If this flag is set, the currently selected value
             //! gets a color gradient
-            static const __int64 AuswahlBuffer = 0x000100000;
+            static const __int64 SelectionBuffer = 0x000100000;
             //! If this flag is set, the currently selected value
             //! gets a border
             static const __int64 SelectionBorder = 0x000200000;
@@ -60,29 +60,29 @@ namespace Framework
             static const __int64 MaxHeight = 0x004000000;
             //! If this flag is set, the element the mouse is pointing
             //! at has a background
-            static const __int64 MausHintergrund = 0x008000000;
+            static const __int64 MouseBackground = 0x008000000;
             //! If this flag is set, the element the mouse is pointing
             //! at has a background image
-            static const __int64 MausHImage = 0x010000000;
+            static const __int64 MouseHImage = 0x010000000;
             //! If this flag is set, the element the mouse is pointing
             //! at has a transparent background
-            static const __int64 MausHAlpha = 0x020000000;
+            static const __int64 MouseHAlpha = 0x020000000;
             //! If this flag is set, the element the mouse is pointing
             //! at has a color gradient
-            static const __int64 MausBuffer = 0x040000000;
+            static const __int64 MouseBuffer = 0x040000000;
             //! If this flag is set, the element the mouse is pointing
             //! at has a border
-            static const __int64 MausRahmen = 0x080000000;
-            //! const int NachObenAusklappen	= 0x100000000;
-            //! const int AutoAusklappRichtung	= 0x200000000;
+            static const __int64 MouseBorder = 0x080000000;
+            //! const int NachObenDropDownen	= 0x100000000;
+            //! const int AutoDropDownRichtung	= 0x200000000;
 
             //! Normal style: Visible, Enabled, Border, FieldBorder,
             //! SelectionBuffer, SelectionBorder, MaxHeight, VScroll,
             //! MouseBorder, MouseBuffer
             static const __int64 Normal
-                = Sichtbar | Erlaubt | Border | FieldBorder | AuswahlBuffer
-                | SelectionBorder | MaxHeight | VScroll | MausRahmen | MausBuffer
-                | Hintergrund | MEIgnoreParentInside | MEIgnoreVerarbeitet;
+                = Visible | Allowed | Border | FieldBorder | SelectionBuffer
+                | SelectionBorder | MaxHeight | VScroll | MouseBorder | MouseBuffer
+                | Background | MEIgnoreParentInside | MEIgnoreProcessed;
         };
 
     private:
@@ -91,29 +91,29 @@ namespace Framework
         RCArray<TextField>* members;
         Button* ausfahren;
         Border* selBorder;
-        int auswBgF;
-        Image* auswBgB;
-        AlphaField* auswAf;
+        int selBgF;
+        Image* selBgB;
+        AlphaField* selAf;
         RCArray<Border>* msSelBorder;
-        Array<int>* msAuswBgF;
-        RCArray<Image>* msAuswBgB;
-        RCArray<AlphaField>* msAuswAf;
+        Array<int>* msSelBgF;
+        RCArray<Image>* msSelBgB;
+        RCArray<AlphaField>* msSelAf;
         Border* mouseBorder;
-        int mausBgF;
-        Image* mausBgB;
-        AlphaField* mausAf;
+        int mouseBgF;
+        Image* mouseBgB;
+        AlphaField* mouseAf;
         RCArray<Border>* msMouseBorder;
-        Array<int>* msMausBgF;
-        RCArray<Image>* msMausBgB;
-        RCArray<AlphaField>* msMausAf;
+        Array<int>* msMouseBgF;
+        RCArray<Image>* msMouseBgB;
+        RCArray<AlphaField>* msMouseAf;
         int anzahl;
-        int auswahl;
+        int selection;
         bool ausgeklappt;
         int ausklappHeight;
         int ausklapMaxHeight;
-        int eintragHeight;
+        int entryHeight;
         double tickval;
-        int mausEintrag;
+        int mouseEntry;
         bool scrollAnzeigen;
         void* eAkP;
         std::function<void(void*, SelectionBox*, int, int)> eAk;
@@ -138,61 +138,61 @@ namespace Framework
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets the used font
-        //! \param schrift The font
-        DLLEXPORT void setFontZ(Font* schrift);
+        //! \param font The font
+        DLLEXPORT void setFontZ(Font* font);
         //! Adds a selectable entry to the list. The first entry is
         //! automatically selected at the beginning \param txt The text of
         //! the entry
-        DLLEXPORT void addEintrag(const char* txt);
+        DLLEXPORT void addEntry(const char* txt);
         //! Adds a selectable entry to the list. The first entry is
         //! automatically selected at the beginning \param txt The text of
         //! the entry
-        DLLEXPORT void addEintrag(Text* txt);
+        DLLEXPORT void addEntry(Text* txt);
         //! Adds a selectable entry to the list. The first entry is
         //! automatically selected at the beginning \param txt A pointer to
         //! the entry
-        DLLEXPORT void addEintragZ(TextField* txt);
+        DLLEXPORT void addEntryZ(TextField* txt);
         //! Changes the text of an entry
         //! \param i The index of the entry
         //! \param txt The new text
-        DLLEXPORT void setEintrag(int i, const char* txt);
+        DLLEXPORT void setEntry(int i, const char* txt);
         //! Changes the text of an entry
         //! \param i The index of the entry
         //! \param txt The new text
-        DLLEXPORT void setEintrag(int i, Text* txt);
+        DLLEXPORT void setEntry(int i, Text* txt);
         //! Changes an entry
         //! \param i The index of the entry
         //! \param txt A pointer to the new entry
-        DLLEXPORT void setEintragZ(int i, TextField* txt);
+        DLLEXPORT void setEntryZ(int i, TextField* txt);
         //! Deletes an entry
         //! \param i The index of the entry
-        DLLEXPORT void removeEintrag(int i);
+        DLLEXPORT void removeEntry(int i);
         //! Sets a pointer to the button used for expanding and collapsing
         //! the list \param ausK The button
         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);
+        //! \param i The index of the entry \param border The border
+        DLLEXPORT void setEntryBorderZ(int i, Border* border);
         //! Sets the color of a border used for a specific entry
         //! \param i The index of the entry \param f The color in
         //! A8R8G8B8 format
-        DLLEXPORT void setEintragRahmenFarbe(int i, int f);
+        DLLEXPORT void setEntryBorderColor(int i, int f);
         //! Sets the width of a border used for a specific entry
         //! \param i The index of the entry \param rbr The width
         //! of the border in pixels
-        DLLEXPORT void setEintragRahmenBreite(int i, int rbr);
+        DLLEXPORT void setEntryBorderWidth(int i, int rbr);
         //! Sets a background color used for a specific entry
         //! \param i The index of the entry \param f The color in
         //! A8R8G8B8 format
-        DLLEXPORT void setEintragHintergrundFarbe(int i, int f);
+        DLLEXPORT void setEntryBackgroundColor(int i, int f);
         //! Sets a pointer to a background image used for a specific
         //! entry \param i The index of the entry
         //! \param bgB The background image
-        DLLEXPORT void setEintragHintergrundImageZ(int i, Image* bgB);
+        DLLEXPORT void setEntryBackgroundImageZ(int i, Image* bgB);
         //! Sets a background image by copying, used for a specific
         //! entry \param i The index of the entry \param bgB The
         //! background image
-        DLLEXPORT void setEintragHintergrundImage(int i, Image* bgB);
+        DLLEXPORT void setEntryBackgroundImage(int i, Image* bgB);
         //! Sets a pointer to a color gradient used for a specific
         //! entry \param i The index of the entry \param af The
         //! color gradient
@@ -200,29 +200,29 @@ namespace Framework
         //! 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
-        DLLEXPORT void setEintragAlphaFeldFarbe(int i, int afF);
+        DLLEXPORT void setEntryAlphaFieldColor(int i, int afF);
         //! Sets the strength of a color gradient used for a specific
         //! entry \param i The index of the entry \param afSt The
         //! strength
-        DLLEXPORT void setEintragAlphaFeldStrength(int i, int afSt);
+        DLLEXPORT void setEntryAlphaFieldStrength(int i, int afSt);
         //! Sets a pointer to a border used for the selected entry
-        //! \param rahmen The border
-        DLLEXPORT void setSelBorderZ(Border* rahmen);
+        //! \param border The border
+        DLLEXPORT void setSelBorderZ(Border* border);
         //! Sets the color of a border used for the selected entry
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setAuswRahmenFarbe(int f);
+        DLLEXPORT void setSelBorderColor(int f);
         //! Sets the width of a border used for the selected entry
         //! \param rbr The width in pixels
-        DLLEXPORT void setAuswRahmenBreite(int rbr);
+        DLLEXPORT void setSelBorderWidth(int rbr);
         //! Sets the background color used for the selected entry
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setAuswHintergrundFarbe(int f);
+        DLLEXPORT void setSelBackgroundColor(int f);
         //! Sets a pointer to a background image used for the selected
         //! entry \param bgB The image
-        DLLEXPORT void setAuswHintergrundImageZ(Image* bgB);
+        DLLEXPORT void setSelBackgroundImageZ(Image* bgB);
         //! Sets a background image by copying, used for the selected
         //! entry \param bgB The image
-        DLLEXPORT void setAuswHintergrundImage(Image* bgB);
+        DLLEXPORT void setSelBackgroundImage(Image* bgB);
         //! Sets a pointer to a color gradient used for the selected
         //! entry \param af The color gradient
         DLLEXPORT void setSelAlphaFieldZ(AlphaField* af);
@@ -231,33 +231,33 @@ namespace Framework
         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);
+        DLLEXPORT void setSelAlphaFieldStrength(int afSt);
         //! Sets a pointer to a border used with the MultiStyled flag
         //! when selecting a specific entry \param i
-        //! The index of the entry \param rahmen The border
-        DLLEXPORT void setMsSelBorderZ(int i, Border* rahmen);
+        //! The index of the entry \param border The border
+        DLLEXPORT void setMsSelBorderZ(int i, Border* border);
         //! Sets the color of a border used with the MultiStyled flag when
         //! selecting a specific entry \param i The index
         //! of the entry \param f The color in A8R8G8B8 format
-        DLLEXPORT void setMsAuswRahmenFarbe(int i, int f);
+        DLLEXPORT void setMsSelBorderColor(int i, int f);
         //! Sets the width of a border used with the MultiStyled flag when
         //! selecting a specific entry \param i The
         //! index of the entry \param rbr The width in pixels
-        DLLEXPORT void setMsAuswRahmenBreite(int i, int rbr);
+        DLLEXPORT void setMsSelBorderWidth(int i, int rbr);
         //! Sets the background color used with the MultiStyled flag when
         //! selecting a specific entry \param i The index
         //! of the entry \param f The color in A8R8G8B8 format
-        DLLEXPORT void setMsAuswHintergrundFarbe(int i, int f);
+        DLLEXPORT void setMsSelBackgroundColor(int i, int f);
         //! Sets a pointer to a background image used with the MultiStyled
         //! flag when selecting a specific entry
         //! \param i The index of the entry
         //! \param bgB The image
-        DLLEXPORT void setMsAuswHintergrundImageZ(int i, Image* bgB);
+        DLLEXPORT void setMsSelBackgroundImageZ(int i, Image* bgB);
         //! Sets a background image by copying, used with the MultiStyled
         //! flag when selecting a specific entry
         //! \param i The index of the entry
         //! \param bgB The image
-        DLLEXPORT void setMsAuswHintergrundImage(int i, Image* bgB);
+        DLLEXPORT void setMsSelBackgroundImage(int i, Image* bgB);
         //! Sets a pointer to a color gradient used with the MultiStyled
         //! flag when selecting a specific entry
         //! \param i The index of the entry
@@ -266,29 +266,29 @@ namespace Framework
         //! 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
-        DLLEXPORT void setMsAuswAlphaFeldFarbe(int i, int afF);
+        DLLEXPORT void setMsSelAlphaFieldColor(int i, int afF);
         //! Sets the strength of a color gradient used with the MultiStyled
         //! flag when selecting a specific entry \param i
         //! The index of the entry \param afSt The strength
-        DLLEXPORT void setMsAuswAlphaFeldStrength(int i, int afSt);
+        DLLEXPORT void setMsSelAlphaFieldStrength(int i, int afSt);
         //! Sets a pointer to a border used for the entry the mouse is
-        //! pointing at \param rahmen The border
-        DLLEXPORT void setMouseBorderZ(Border* rahmen);
+        //! pointing at \param border The border
+        DLLEXPORT void setMouseBorderZ(Border* border);
         //! Sets the color of a border used for the entry the mouse is
         //! pointing at \param f The color in A8R8G8B8 format
-        DLLEXPORT void setMausRahmenFarbe(int f);
+        DLLEXPORT void setMouseBorderColor(int f);
         //! Sets the width of a border used for the entry the mouse is
         //! pointing at \param rbr The width of the border in pixels
-        DLLEXPORT void setMausRahmenBreite(int rbr);
+        DLLEXPORT void setMouseBorderWidth(int rbr);
         //! Sets the background color used for the entry the mouse is
         //! pointing at \param f The color in A8R8G8B8 format
-        DLLEXPORT void setMausHintergrundFarbe(int f);
+        DLLEXPORT void setMouseBackgroundColor(int f);
         //! Sets a pointer to a background image used for the entry the mouse
         //! is pointing at \param bgB The image
-        DLLEXPORT void setMausHintergrundImageZ(Image* bgB);
+        DLLEXPORT void setMouseBackgroundImageZ(Image* bgB);
         //! Sets a background image by copying, used for the entry the mouse
         //! is pointing at \param bgB The image
-        DLLEXPORT void setMausHintergrundImage(Image* bgB);
+        DLLEXPORT void setMouseBackgroundImage(Image* bgB);
         //! Sets a color gradient used for the entry the mouse is pointing
         //! at \param af The color gradient
         DLLEXPORT void setMouseAlphaFieldZ(AlphaField* af);
@@ -297,33 +297,33 @@ namespace Framework
         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);
+        DLLEXPORT void setMouseAlphaFieldStrength(int afSt);
         //! Sets a pointer to a border used with the MultiStyled flag for a
         //! specific entry the mouse is pointing at
         //! \param i The index of the entry
-        //! \param rahmen The border
-        DLLEXPORT void setMsMouseBorderZ(int i, Border* rahmen);
+        //! \param border The border
+        DLLEXPORT void setMsMouseBorderZ(int i, Border* border);
         //! Sets the color of a border used with the MultiStyled flag for a
         //! specific entry the mouse is pointing at \param i
         //! The index of the entry \param f The color in A8R8G8B8 format
-        DLLEXPORT void setMsMausRahmenFarbe(int i, int f);
+        DLLEXPORT void setMsMouseBorderColor(int i, int f);
         //! Sets the width of a border used with the MultiStyled flag for a
         //! specific entry the mouse is pointing at
         //! \param i The index of the entry
         //! \param rbr The width in pixels
-        DLLEXPORT void setMsMausRahmenBreite(int i, int rbr);
+        DLLEXPORT void setMsMouseBorderWidth(int i, int rbr);
         //! Sets the background color used with the MultiStyled flag for a
         //! specific entry the mouse is pointing at \param i
         //! The index of the entry \param f The color in A8R8G8B8 format
-        DLLEXPORT void setMsMausHintergrundFarbe(int i, int f);
+        DLLEXPORT void setMsMouseBackgroundColor(int i, int f);
         //! Sets a pointer to a background image used with the MultiStyled
         //! flag for a specific entry the mouse is pointing at
         //! \param i The index of the entry \param bgB The image
-        DLLEXPORT void setMsMausHintergrundImageZ(int i, Image* bgB);
+        DLLEXPORT void setMsMouseBackgroundImageZ(int i, Image* bgB);
         //! Sets a background image by copying, used with the MultiStyled
         //! flag for a specific entry the mouse is pointing at
         //! \param i The index of the entry \param bgB The image
-        DLLEXPORT void setMsMausHintergrundImage(int i, Image* bgB);
+        DLLEXPORT void setMsMouseBackgroundImage(int i, Image* bgB);
         //! 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
@@ -332,28 +332,28 @@ namespace Framework
         //! flag for a specific entry the mouse is pointing at
         //! \param i The index of the entry
         //! \param afF The color in A8R8G8B8 format
-        DLLEXPORT void setMsMausAlphaFeldFarbe(int i, int afF);
+        DLLEXPORT void setMsMouseAlphaFieldColor(int i, int afF);
         //! Sets the strength 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
         //! \param afSt The strength
-        DLLEXPORT void setMsMausAlphaFeldStrength(int i, int afSt);
+        DLLEXPORT void setMsMouseAlphaFieldStrength(int i, int afSt);
         //! Selects an element
         //! \param i The index of the element
-        DLLEXPORT void setAuswahl(int i);
+        DLLEXPORT void setSelection(int i);
         //! Expands the list for selection
-        DLLEXPORT void ausklappen();
+        DLLEXPORT void expand();
         //! Collapses the list
-        DLLEXPORT void einklappen();
+        DLLEXPORT void collapse();
         //! Scrolls in the list to a specific entry
         //! \param i The index of the entry
-        DLLEXPORT void scrollZuEintrag(int i);
+        DLLEXPORT void scrollToEntry(int i);
         //! Sets the maximum expansion height of the list
         //! \param maxHeight The maximum height in pixels
         DLLEXPORT void setMaxAuskappHeight(int maxHeight);
         //! Sets the height of the entries
         //! \param height The height in pixels
-        DLLEXPORT void setEintragHeight(int height);
+        DLLEXPORT void setEntryHeight(int height);
         //! Adds styles to a specific entry if the MultiStyled flag
         //! is set \param i The index of the entry \param
         //! abStyle The style to add
@@ -384,32 +384,32 @@ namespace Framework
         DLLEXPORT void render(Image& zRObj) override;
         //! Returns the index of an entry
         //! \param txt The text of the entry
-        DLLEXPORT int getEintragPos(const char* txt) const;
+        DLLEXPORT int getEntryPos(const char* txt) const;
         //! Returns the index of an entry
         //! \param txt The text of the entry
-        DLLEXPORT int getEintragPos(Text* txt) const;
+        DLLEXPORT int getEntryPos(Text* txt) const;
         //! Returns the text of an entry
         //! \param i The index of the entry
-        DLLEXPORT Text* getEintragText(int i) const;
+        DLLEXPORT Text* getEntryText(int i) const;
         //! Returns the text of an entry without increased reference counter
         //! \param i The index of the entry
-        DLLEXPORT Text* zEintragText(int i) const;
+        DLLEXPORT Text* zEntryText(int i) const;
         //! Returns an entry
         //! \param i The index of the entry
-        DLLEXPORT TextField* getEintrag(int i) const;
+        DLLEXPORT TextField* getEntry(int i) const;
         //! Returns an entry without increased reference counter
         //! \param i The index of the entry
-        DLLEXPORT TextField* zEintrag(int i) const;
+        DLLEXPORT TextField* zEntry(int i) const;
         //! Returns the index of the selected entry
-        DLLEXPORT int getAuswahl() const;
+        DLLEXPORT int getSelection() const;
         //! Returns the number of entries
         DLLEXPORT int getEntryCount() const;
         //! Returns whether the list is currently expanded
-        DLLEXPORT bool istAusgeklappt() const;
+        DLLEXPORT bool isExpanded() const;
         //! Returns the maximum height of the expanded list
         DLLEXPORT int getMaxHeight() const;
         //! Returns the height of an entry
-        DLLEXPORT int getEintragHeight() const;
+        DLLEXPORT int getEntryHeight() const;
         //! Returns the button used for expanding and collapsing the list
         DLLEXPORT Button* getDropDownButton() const;
         //! Returns the button without increased reference counter used for
@@ -423,10 +423,10 @@ namespace Framework
         DLLEXPORT Border* zEntryBorder(int i) const;
         //! Returns the color of a border of an entry in A8R8G8B8 format
         //! \param i The index of the entry
-        DLLEXPORT int getEintragRahmenFarbe(int i) const;
+        DLLEXPORT int getEntryBorderColor(int i) const;
         //! Returns the width of a border of an entry
         //! \param i The index of the entry
-        DLLEXPORT int getEintragRahmenBreite(int i) const;
+        DLLEXPORT int getEntryBorderWidth(int i) const;
         //! Returns the color gradient of an entry
         //! \param i The index of the entry
         DLLEXPORT AlphaField* getEntryAlphaField(int i) const;
@@ -435,19 +435,19 @@ namespace Framework
         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;
+        DLLEXPORT int getEntryAlphaFieldColor(int i) const;
         //! Returns the strength of a color gradient of an entry
         //! \param i The index of the entry
-        DLLEXPORT int getEintragAlphaFeldStrength(int i) const;
+        DLLEXPORT int getEntryAlphaFieldStrength(int i) const;
         //! Returns the background color of an entry in A8R8G8B8 format
         //! \param i The index of the entry
-        DLLEXPORT int getEintragHintergrundFarbe(int i) const;
+        DLLEXPORT int getEntryBackgroundColor(int i) const;
         //! Returns the background image of an entry
         //! \param i The index of the entry
-        DLLEXPORT Image* getEintragHintergrundImage(int i) const;
+        DLLEXPORT Image* getEntryBackgroundImage(int i) const;
         //! Returns the background image of an entry without increased reference
         //! counter \param i The index of the entry
-        DLLEXPORT Image* zEintragHintergrundImage(int i) const;
+        DLLEXPORT Image* zEntryBackgroundImage(int i) const;
         //! Returns the border used when selecting an entry
         DLLEXPORT Border* getSelBorder() const;
         //! Returns the border without increased reference counter used when
@@ -455,9 +455,9 @@ namespace Framework
         DLLEXPORT Border* zSelBorder() const;
         //! Returns the color of the border in A8R8G8B8 format used when
         //! selecting an entry
-        DLLEXPORT int getAuswRahmenFarbe() const;
+        DLLEXPORT int getSelBorderColor() const;
         //! Returns the width of the border used when selecting an entry
-        DLLEXPORT int getAuswRahmenBreite() const;
+        DLLEXPORT int getSelBorderWidth() const;
         //! Returns the color gradient used when selecting an entry
         DLLEXPORT AlphaField* getSelAlphaField() const;
         //! Returns the color gradient without increased reference counter used
@@ -465,18 +465,18 @@ namespace Framework
         DLLEXPORT AlphaField* zSelAlphaField() const;
         //! Returns the color of the color gradient used when selecting
         //! an entry
-        DLLEXPORT int getAuswAlphaFeldFarbe() const;
+        DLLEXPORT int getSelAlphaFieldColor() const;
         //! Returns the strength of the color gradient used when selecting
         //! an entry
-        DLLEXPORT int getAuswAlphaFeldStrength() const;
+        DLLEXPORT int getSelAlphaFieldStrength() const;
         //! Returns the background color in A8R8G8B8 format used when
         //! selecting an entry
-        DLLEXPORT int getAuswHintergrundFarbe() const;
+        DLLEXPORT int getSelBackgroundColor() const;
         //! Returns the background image used when selecting an entry
-        DLLEXPORT Image* getAuswHintergrundImage() const;
+        DLLEXPORT Image* getSelBackgroundImage() const;
         //! Returns the background image without increased reference counter used
         //! when selecting an entry
-        DLLEXPORT Image* zAuswHintergrundImage() const;
+        DLLEXPORT Image* zSelBackgroundImage() const;
         //! Returns the border used with the MultiStyled flag when selecting
         //! a specific entry \param i The index of the entry
         DLLEXPORT Border* getMsSelBorder(int i) const;
@@ -487,10 +487,10 @@ namespace Framework
         //! Returns the color of the border in A8R8G8B8 format used with the
         //! MultiStyled flag when selecting a specific entry
         //! \param i The index of the entry
-        DLLEXPORT int getMsAuswRahmenFarbe(int i) const;
+        DLLEXPORT int getMsSelBorderColor(int i) const;
         //! Returns the width of the border used with the MultiStyled flag when
         //! selecting a specific entry \param i The index of the entry
-        DLLEXPORT int getMsAuswRahmenBreite(int i) const;
+        DLLEXPORT int getMsSelBorderWidth(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 AlphaField* getMsSelAlphaField(int i) const;
@@ -501,22 +501,22 @@ namespace Framework
         //! 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
-        DLLEXPORT int getMsAuswAlphaFeldFarbe(int i) const;
+        DLLEXPORT int getMsSelAlphaFieldColor(int i) const;
         //! Returns the strength of the color gradient used with the MultiStyled
         //! flag when selecting a specific entry
         //! \param i The index of the entry
-        DLLEXPORT int getMsAuswAlphaFeldStrength(int i) const;
+        DLLEXPORT int getMsSelAlphaFieldStrength(int i) const;
         //! Returns the background color in A8R8G8B8 format used with the
         //! MultiStyled flag when selecting a specific entry
         //! \param i The index of the entry
-        DLLEXPORT int getMsAuswHintergrundFarbe(int i) const;
+        DLLEXPORT int getMsSelBackgroundColor(int i) const;
         //! Returns the background image used with the MultiStyled flag when
         //! selecting a specific entry \param i The index of the entry
-        DLLEXPORT Image* getMsAuswHintergrundImage(int i) const;
+        DLLEXPORT Image* getMsSelBackgroundImage(int i) const;
         //! Returns the background image without increased reference counter used
         //! with the MultiStyled flag when selecting a specific entry
         //! \param i The index of the entry
-        DLLEXPORT Image* zMsAuswHintergrundImage(int i) const;
+        DLLEXPORT Image* zMsSelBackgroundImage(int i) const;
         //! Returns the border used when the mouse is pointing at an entry
         DLLEXPORT Border* getMouseBorder() const;
         //! Returns the border without increased reference counter used when
@@ -524,10 +524,10 @@ namespace Framework
         DLLEXPORT Border* zMouseBorder() const;
         //! Returns the color of the border in A8R8G8B8 format used when
         //! the mouse is pointing at an entry
-        DLLEXPORT int getMausRahmenFarbe() const;
+        DLLEXPORT int getMouseBorderColor() const;
         //! Returns the width of the border used when the mouse is pointing
         //! at an entry
-        DLLEXPORT int getMausRahmenBreite() const;
+        DLLEXPORT int getMouseBorderWidth() const;
         //! Returns the color gradient used when the mouse is pointing
         //! at an entry
         DLLEXPORT AlphaField* getMouseAlphaField() const;
@@ -536,19 +536,19 @@ namespace Framework
         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;
+        DLLEXPORT int getMouseAlphaFieldColor() const;
         //! Returns the strength of the color gradient used when the mouse
         //! is pointing at an entry
-        DLLEXPORT int getMausAlphaFeldStrength() const;
+        DLLEXPORT int getMouseAlphaFieldStrength() const;
         //! Returns the background color in A8R8G8B8 format used when the
         //! mouse is pointing at an entry
-        DLLEXPORT int getMausHintergrundFarbe() const;
+        DLLEXPORT int getMouseBackgroundColor() const;
         //! Returns the background image used when the mouse is pointing
         //! at an entry
-        DLLEXPORT Image* getMausHintergrundImage() const;
+        DLLEXPORT Image* getMouseBackgroundImage() const;
         //! Returns the background image without increased reference counter used
         //! when the mouse is pointing at an entry
-        DLLEXPORT Image* zMausHintergrundImage() const;
+        DLLEXPORT Image* zMouseBackgroundImage() const;
         //! Returns the border used with the Multistyle flag when the mouse
         //! is pointing at a specific entry \param i The index of the entry
         DLLEXPORT Border* getMsMouseBorder(int i) const;
@@ -559,11 +559,11 @@ namespace Framework
         //! Returns the color of the border in A8R8G8B8 format used with the
         //! Multistyle flag when the mouse is pointing at a specific entry
         //! \param i The index of the entry
-        DLLEXPORT int getMsMausRahmenFarbe(int i) const;
+        DLLEXPORT int getMsMouseBorderColor(int i) const;
         //! Returns the width of the border used with the Multistyle flag
         //! when the mouse is pointing at a specific entry
         //! \param i The index of the entry
-        DLLEXPORT int getMsMausRahmenBreite(int i) const;
+        DLLEXPORT int getMsMouseBorderWidth(int i) const;
         //! 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
@@ -575,38 +575,38 @@ namespace Framework
         //! 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
-        DLLEXPORT int getMsMausAlphaFeldFarbe(int i) const;
+        DLLEXPORT int getMsMouseAlphaFieldColor(int i) const;
         //! Returns the strength of 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 int getMsMausAlphaFeldStrength(int i) const;
+        DLLEXPORT int getMsMouseAlphaFieldStrength(int i) const;
         //! Returns the background color in A8R8G8B8 format used with the
         //! Multistyle flag when the mouse is pointing at a specific entry
         //! \param i The index of the entry
-        DLLEXPORT int getMsMausHintergrundFarbe(int i) const;
+        DLLEXPORT int getMsMouseBackgroundColor(int i) const;
         //! Returns the background image used with the Multistyle flag when
         //! the mouse is pointing at a specific entry
         //! \param i The index of the entry
-        DLLEXPORT Image* getMsMausHintergrundImage(int i) const;
+        DLLEXPORT Image* getMsMouseBackgroundImage(int i) const;
         //! Returns the background image 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 Image* zMsMausHintergrundImage(int i) const;
+        DLLEXPORT Image* zMsMouseBackgroundImage(int i) const;
         //! Checks whether a point is inside this object
         //! \param x The x coordinate of the point
         //! \param y The y coordinate of the point
         //! \return 1 if the point is inside, 0 otherwise
-        DLLEXPORT bool istPunktInnen(int x, int y) const override;
+        DLLEXPORT bool isPointInside(int x, int y) const override;
         //! Checks whether a specific style is set for a specific entry with the
         //! MultiStyled flag \param i The index of the entry
         //! \param abStyle The style
-        DLLEXPORT inline bool hatMsStyle(int i, __int64 abStyle) const;
+        DLLEXPORT inline bool hasMsStyle(int i, __int64 abStyle) const;
         //! Checks whether a specific style is not set for a specific entry with
         //! the MultiStyled flag \param i The index of the entry
         //! \param abStyle The style
-        DLLEXPORT inline bool hatMsStyleNicht(int i, __int64 abStyle) const;
+        DLLEXPORT inline bool hasMsStyleNot(int i, __int64 abStyle) const;
         DLLEXPORT Drawable*
-        dublizieren() const override; //! Creates a copy of the drawing
+        duplicate() const override; //! Creates a copy of the drawing
     };
 } // namespace Framework
 

Shader.cpp

@@ -43,14 +43,14 @@ bool Shader::removeConstBuffer(int index)
 //  index: The index of the buffer
 //  laen: The length of the data in bytes (-1 for the maximum size of the
 //  buffer)
-bool Shader::fuellConstBuffer(char* data, int index, int len)
+bool Shader::fillConstBuffer(char* data, int index, int len)
 {
     if (index < 0 || index > constBuffers->getLastIndex()) return 0;
     DXBuffer* zB = constBuffers->z(index);
     if (!zB) return 0;
-    if (len < 0) len = zB->getElementAnzahl() * zB->getElementLength();
+    if (len < 0) len = zB->getElementCount() * zB->getElementLength();
     zB->setData(data);
-    zB->copieren(len);
+    zB->copyData(len);
     return 1;
 }
 
@@ -61,7 +61,7 @@ int Shader::getConstBufferLaenge(int index) const
     if (index < 0 || index > constBuffers->getLastIndex()) return 0;
     DXBuffer* zB = constBuffers->z(index);
     if (!zB) return 0;
-    return zB->getElementAnzahl() * zB->getElementLength();
+    return zB->getElementCount() * zB->getElementLength();
 }
 
 // Returns the shader type
@@ -75,7 +75,7 @@ int Shader::getFirstUninitializedBufferIndex() const
 {
     for (int index = 0; index < constBuffers->getEntryCount(); index++)
     {
-        if (!constBuffers->hat(index) || !constBuffers->z(index)) return index;
+        if (!constBuffers->has(index) || !constBuffers->z(index)) return index;
     }
     return constBuffers->getEntryCount();
 }
@@ -96,14 +96,14 @@ DX11Shader::~DX11Shader() {}
 //  index: The position of the buffer in the buffer array. Existing buffer
 //  is replaced. Buffer 1 cannot be created if buffer 0 has not yet
 //  been created, etc.
-bool DX11Shader::erstelleConstBuffer(int groesse, int index)
+bool DX11Shader::createConstBuffer(int groesse, int index)
 {
     if (index < 0 || index >= 14) return 0;
     bool ok = 1;
     while ((groesse / 16) * 16
            != groesse) // only multiples of 16 are allowed as size
         groesse++;
-    while (!constBuffers->hat(index))
+    while (!constBuffers->has(index))
         constBuffers->add(0);
     constBuffers->set(
         new DX11Buffer(1, device, context, D3D11_BIND_CONSTANT_BUFFER), index);
@@ -139,14 +139,14 @@ bool DX11PixelShader::setCompiledByteArray(unsigned char* bytes, int length)
 
 // After calling this function, this shader is used as pixel shader
 //  zD3d11Context: The context object used with the shader
-void DX11PixelShader::benutzeShader()
+void DX11PixelShader::useShader()
 {
     int maxI = constBuffers->getLastIndex();
     for (int i = 0; i <= maxI; i++)
     {
         if (!constBuffers->z(i)) continue;
         if (!((DX11Buffer*)constBuffers->z(i))->zBuffer())
-            constBuffers->z(i)->copieren();
+            constBuffers->z(i)->copyData();
         ID3D11Buffer* buf = ((DX11Buffer*)constBuffers->z(i))->zBuffer();
         context->PSSetConstantBuffers(i, 1, &buf);
     }
@@ -191,7 +191,7 @@ bool DX11VertexShader::setCompiledByteArray(unsigned char* bytes, int length)
 //  zD3d11Device: The device used to create the layout
 //  descArray: An array with initialization data
 //  anz: The number of elements in the array
-bool DX11VertexShader::erstelleInputLayout(
+bool DX11VertexShader::createInputLayout(
     D3D11_INPUT_ELEMENT_DESC* descArray, int anz)
 {
     if (!shaderByteBuffer) return 0;
@@ -209,14 +209,14 @@ bool DX11VertexShader::erstelleInputLayout(
 
 // After calling this function, this shader is used as vertex shader
 //  zD3d11Context: The context object used with the shader
-void DX11VertexShader::benutzeShader()
+void DX11VertexShader::useShader()
 {
     int maxI = constBuffers->getLastIndex();
     for (int i = 0; i <= maxI; i++)
     {
         if (!constBuffers->z(i)) continue;
         if (!((DX11Buffer*)constBuffers->z(i))->zBuffer())
-            constBuffers->z(i)->copieren();
+            constBuffers->z(i)->copyData();
         ID3D11Buffer* buf = ((DX11Buffer*)constBuffers->z(i))->zBuffer();
         context->VSSetConstantBuffers(i, 1, &buf);
     }

Shader.h

@@ -46,7 +46,7 @@ namespace Framework
         //! After calling this function, this shader is used as a pixel shader
         //!  zD3d11Context: The context object with which the shader should
         //!  be used
-        virtual void benutzeShader() = 0;
+        virtual void useShader() = 0;
         //! Creates a constant buffer that passes constant data to the shader.
         //! A maximum of 14 buffers can be created.
         //!  zD3d11Device: The device with which the buffer should be created
@@ -54,7 +54,7 @@ namespace Framework
         //! \param index The position of the buffer in the buffer array. An
         //! existing buffer will be replaced. Buffer 1 cannot be created
         //! if buffer 0 has not been created yet, etc.
-        virtual bool erstelleConstBuffer(int size, int index) = 0;
+        virtual bool createConstBuffer(int size, int index) = 0;
         //! Deletes a constant buffer
         //! \param index The index of the buffer to delete. Buffer 0 cannot
         //! be deleted while buffer 1 still exists, etc.
@@ -65,7 +65,7 @@ namespace Framework
         //! \param index The index of the buffer
         //! \param len The length of the data in bytes (-1 for the maximum
         //! buffer size)
-        DLLEXPORT bool fuellConstBuffer(char* data, int index, int len = -1);
+        DLLEXPORT bool fillConstBuffer(char* data, int index, int len = -1);
         //! Returns the length of a constant buffer
         //! \param index The index of the buffer
         DLLEXPORT int getConstBufferLaenge(int index) const;
@@ -92,7 +92,7 @@ namespace Framework
         //! \param index The position of the buffer in the buffer array. An
         //! existing buffer will be replaced. Buffer 1 cannot be created
         //! if buffer 0 has not been created yet, etc.
-        DLLEXPORT virtual bool erstelleConstBuffer(
+        DLLEXPORT virtual bool createConstBuffer(
             int size, int index) override;
     };
 
@@ -118,7 +118,7 @@ namespace Framework
         //! After calling this function, this shader is used as a pixel shader
         //!  zD3d11Context: The context object with which the shader should
         //!  be used
-        DLLEXPORT void benutzeShader() override;
+        DLLEXPORT void useShader() override;
     };
 
     //! Manages a vertex shader
@@ -148,11 +148,11 @@ namespace Framework
         //!  zD3d11Device: The device with which the layout should be created
         //! \param descArray An array with initialization data
         //! \param anz The number of elements in the array
-        DLLEXPORT bool erstelleInputLayout(
+        DLLEXPORT bool createInputLayout(
             D3D11_INPUT_ELEMENT_DESC* descArray, int anz);
         //! After calling this function, this shader is used as a vertex shader
         //!  zD3d11Context: The context object with which the shader should
         //!  be used
-        DLLEXPORT void benutzeShader() override;
+        DLLEXPORT void useShader() override;
     };
 } // namespace Framework

Slider.cpp

@@ -29,8 +29,8 @@ float Slider::getValue() const
 void Slider::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (gr.x
-        && (me.id == ME_PLinks
-            || (me.id == ME_Bewegung && getMausStand(M_Links))))
+        && (me.id == ME_PLeft
+            || (me.id == ME_Move && getMouseState(M_Left))))
     {
         value = (1 - ((gr.x - 10) - me.mx) / (gr.x - 20.0f)) * 100;
         if (value < 0) value = 0;
@@ -44,12 +44,12 @@ void Slider::doMouseEvent(MouseEvent& me, bool userRet)
 //  zRObj: The image to be drawn into
 void Slider::render(Image& zRObj)
 {
-    if (hatStyle(Style::Sichtbar))
+    if (hasStyle(Style::Visible))
     {
         DrawableBackground::render(zRObj);
         if (zRObj.setDrawOptions(pos, gr))
         {
-            zRObj.drawLinieH(10, gr.y / 2, gr.x - 20, 0xFFFFFFFF);
+            zRObj.drawLineH(10, gr.y / 2, gr.x - 20, 0xFFFFFFFF);
             zRObj.fillRegion(
                 (int)(gr.x / 100 * value - 10), 0, 20, gr.y, 0xFFFFFFFF);
             zRObj.releaseDrawOptions();

Table.cpp

@@ -18,10 +18,10 @@ ObjTable::ObjTable()
       members(new RCArray<RCArray<Drawable>>()),
       spaltenNamen(new RCArray<Text>()),
       zeilenNamen(new RCArray<Text>()),
-      spaltenBreite(new Array<int>()),
+      columnWidth(new Array<int>()),
       zeilenHeight(new Array<int>()),
-      minSpaltenBreite(new Array<int>()),
-      maxSpaltenBreite(new Array<int>()),
+      minSpaltenWidth(new Array<int>()),
+      maxSpaltenWidth(new Array<int>()),
       minZeilenHeight(new Array<int>()),
       maxZeilenHeight(new Array<int>()),
       spaltenAnzahl(0),
@@ -33,8 +33,8 @@ ObjTable::ObjTable()
       mx(0),
       my(0),
       selected(-1, -1),
-      rasterFarbe(0xFF000000),
-      rasterBreite(1),
+      rasterColor(0xFF000000),
+      gridWidth(1),
       aRam(0),
       aAf(0),
       msaRam(new RCArray<RCArray<Border>>()),
@@ -42,7 +42,7 @@ ObjTable::ObjTable()
       styles(new RCArray<Array<__int64>>())
 {
     style = Style::MEIgnoreInside | Style::MEIgnoreParentInside
-          | Style::MEIgnoreSichtbar | Style::MEIgnoreVerarbeitet;
+          | Style::MEIgnoreVisible | Style::MEIgnoreProcessed;
 }
 
 // Destructor
@@ -51,10 +51,10 @@ ObjTable::~ObjTable()
     if (members) members->release();
     if (spaltenNamen) spaltenNamen->release();
     if (zeilenNamen) zeilenNamen->release();
-    if (spaltenBreite) spaltenBreite->release();
+    if (columnWidth) columnWidth->release();
     if (zeilenHeight) zeilenHeight->release();
-    if (minSpaltenBreite) minSpaltenBreite->release();
-    if (maxSpaltenBreite) maxSpaltenBreite->release();
+    if (minSpaltenWidth) minSpaltenWidth->release();
+    if (maxSpaltenWidth) maxSpaltenWidth->release();
     if (minZeilenHeight) minZeilenHeight->release();
     if (maxZeilenHeight) maxZeilenHeight->release();
     if (aRam) aRam->release();
@@ -67,27 +67,27 @@ ObjTable::~ObjTable()
 void ObjTable::doMouseEvent(
     MouseEvent& me, bool userRet) // processes mouse events
 {
-    if (!hatStyle(Style::Sichtbar) || !me.insideParent || me.verarbeitet
+    if (!hasStyle(Style::Visible) || !me.insideParent || me.processed
         || me.mx < 0 || me.my < 0 || me.mx >= gr.x || me.my >= gr.y || !userRet)
     {
-        if (me.id == ME_PLinks)
+        if (me.id == ME_PLeft)
         {
             klickSpalte = -1;
             klickZeile = -1;
         }
-        bool verarbeitet = me.verarbeitet;
-        me.verarbeitet |= hatStyleNicht(Style::Sichtbar);
+        bool processed = me.processed;
+        me.processed |= hasStyleNot(Style::Visible);
         bool insideParent = me.insideParent;
         me.insideParent = 0;
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
+        if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
         me.mx -= rbr;
         me.my -= rbr;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
             me.my += vertikalScrollBar->getScroll();
-        if (hatStyle(Style::HScroll) && horizontalScrollBar)
+        if (hasStyle(Style::HScroll) && horizontalScrollBar)
             me.mx += horizontalScrollBar->getScroll();
-        if (me.id != ME_Betritt && me.id != ME_Leaves)
+        if (me.id != ME_Enter && me.id != ME_Leaves)
         {
             for (int i = 0; i < zeilenAnzahl; ++i)
             {
@@ -100,55 +100,55 @@ void ObjTable::doMouseEvent(
         }
         me.mx += rbr;
         me.my += rbr;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
             me.my -= vertikalScrollBar->getScroll();
-        if (hatStyle(Style::HScroll) && horizontalScrollBar)
+        if (hasStyle(Style::HScroll) && horizontalScrollBar)
             me.mx -= horizontalScrollBar->getScroll();
         me.insideParent = insideParent;
-        if (hatStyleNicht(Style::Sichtbar)) me.verarbeitet = verarbeitet;
+        if (hasStyleNot(Style::Visible)) me.processed = processed;
         return;
     }
     int tmx = me.mx;
     int tmy = me.my;
     bool aufScroll = 0;
-    if (vertikalScrollBar && hatStyle(Style::VScroll)
+    if (vertikalScrollBar && hasStyle(Style::VScroll)
         && me.mx > pos.x + gr.x - 15)
         aufScroll = 1;
-    if (horizontalScrollBar && hatStyle(Style::HScroll)
+    if (horizontalScrollBar && hasStyle(Style::HScroll)
         && me.my > pos.y + gr.y - 15)
         aufScroll = 1;
-    me.mx -= ((horizontalScrollBar && hatStyle(Style::HScroll))
+    me.mx -= ((horizontalScrollBar && hasStyle(Style::HScroll))
                   ? horizontalScrollBar->getScroll()
                   : 0);
-    me.my -= ((vertikalScrollBar && hatStyle(Style::VScroll))
+    me.my -= ((vertikalScrollBar && hasStyle(Style::VScroll))
                   ? vertikalScrollBar->getScroll()
                   : 0);
     lockDrawable();
-    if (!me.verarbeitet && !aufScroll)
+    if (!me.processed && !aufScroll)
     {
         double ox
-            = getMausSpalte(me.mx
-                            + ((horizontalScrollBar && hatStyle(Style::HScroll))
+            = getMouseColumn(me.mx
+                            + ((horizontalScrollBar && hasStyle(Style::HScroll))
                                     ? horizontalScrollBar->getScroll()
                                     : 0));
         double oy
-            = getMausZeile(me.my
-                           + ((vertikalScrollBar && hatStyle(Style::VScroll))
+            = getMouseRow(me.my
+                           + ((vertikalScrollBar && hasStyle(Style::VScroll))
                                    ? vertikalScrollBar->getScroll()
                                    : 0));
-        if (me.id == ME_RLinks)
+        if (me.id == ME_RLeft)
         {
             klickSpalte = -1;
             klickZeile = -1;
             mSpalte = -1, mZeile = -1;
         }
-        if ((hatStyle(Style::SpaltenBreiteChangeable)
-                || hatStyle(Style::ZeilenHeightChangeable))
+        if ((hasStyle(Style::ColumnWidthChangeable)
+                || hasStyle(Style::RowHeightChangeable))
             && klickSpalte < 0 && klickZeile < 0)
         {
-            if (hatStyle(Style::SpaltenBreiteChangeable))
+            if (hasStyle(Style::ColumnWidthChangeable))
             {
-                if (me.id == ME_PLinks && ox != (int)ox)
+                if (me.id == ME_PLeft && ox != (int)ox)
                 {
                     mSpalte = ox;
                     mx = me.mx;
@@ -156,21 +156,21 @@ void ObjTable::doMouseEvent(
                 }
                 if (mSpalte > -1)
                 {
-                    int br = getSpaltenBreite((int)mSpalte) + (me.mx - mx);
-                    if (hatStyle(Style::SpaltenBreiteMax)
-                        && br > getMaxSpaltenBreite((int)mSpalte))
-                        br = getMaxSpaltenBreite((int)mSpalte);
-                    if (hatStyle(Style::SpaltenBreiteMin)
-                        && br < getMinSpaltenBreite((int)mSpalte))
-                        br = getMinSpaltenBreite((int)mSpalte);
-                    setSpaltenBreite((int)mSpalte, br);
+                    int br = getColumnWidth((int)mSpalte) + (me.mx - mx);
+                    if (hasStyle(Style::ColumnWidthMax)
+                        && br > getMaxColumnWidth((int)mSpalte))
+                        br = getMaxColumnWidth((int)mSpalte);
+                    if (hasStyle(Style::ColumnWidthMin)
+                        && br < getMinColumnWidth((int)mSpalte))
+                        br = getMinColumnWidth((int)mSpalte);
+                    setColumnWidth((int)mSpalte, br);
                     mx = me.mx;
                     rend = 1;
                 }
             }
-            if (hatStyle(Style::ZeilenHeightChangeable))
+            if (hasStyle(Style::RowHeightChangeable))
             {
-                if (me.id == ME_PLinks && oy != (int)oy)
+                if (me.id == ME_PLeft && oy != (int)oy)
                 {
                     mZeile = oy;
                     my = me.my;
@@ -178,30 +178,30 @@ void ObjTable::doMouseEvent(
                 }
                 if (mZeile > -1)
                 {
-                    int hi = getZeilenHeight((int)mZeile) + (me.my - my);
-                    if (hatStyle(Style::ZeilenHeightMax)
-                        && hi > getMaxZeilenHeight((int)mZeile))
-                        hi = getMaxZeilenHeight((int)mZeile);
-                    if (hatStyle(Style::ZeilenHeightMin)
-                        && hi < getMinZeilenHeight((int)mZeile))
-                        hi = getMinZeilenHeight((int)mZeile);
-                    setZeilenHeight((int)mZeile, hi);
+                    int hi = getRowHeight((int)mZeile) + (me.my - my);
+                    if (hasStyle(Style::RowHeightMax)
+                        && hi > getMaxRowHeight((int)mZeile))
+                        hi = getMaxRowHeight((int)mZeile);
+                    if (hasStyle(Style::RowHeightMin)
+                        && hi < getMinRowHeight((int)mZeile))
+                        hi = getMinRowHeight((int)mZeile);
+                    setRowHeight((int)mZeile, hi);
                     my = me.my;
                     rend = 1;
                 }
             }
         }
-        if (hatStyle(Style::SpaltenBeweglich) && ox == (int)ox && mSpalte == -1
+        if (hasStyle(Style::ColumnsMovable) && ox == (int)ox && mSpalte == -1
             && mZeile == -1)
         {
             if (klickSpalte >= 0 && klickSpalte < spaltenAnzahl
                 && klickSpalte != ox && !oy && ox >= 0)
             {
-                setSpaltePosition(klickSpalte, (int)ox);
+                setColumnPosition(klickSpalte, (int)ox);
                 klickSpalte = (int)ox;
                 rend = 1;
             }
-            if (me.id == ME_PLinks)
+            if (me.id == ME_PLeft)
             {
                 if (!oy && klickSpalte < 0)
                 {
@@ -210,17 +210,17 @@ void ObjTable::doMouseEvent(
                 }
             }
         }
-        if (hatStyle(Style::ZeilenBeweglich) && oy == (int)oy && mSpalte == -1
+        if (hasStyle(Style::RowsMovable) && oy == (int)oy && mSpalte == -1
             && mZeile == -1)
         {
             if (klickZeile >= 0 && klickZeile < zeilenAnzahl && klickZeile != oy
                 && !ox && oy >= 0)
             {
-                setZeilePosition(klickZeile, (int)oy);
+                setRowPosition(klickZeile, (int)oy);
                 klickZeile = (int)oy;
                 rend = 1;
             }
-            if (me.id == ME_PLinks)
+            if (me.id == ME_PLeft)
             {
                 if (!ox && klickZeile < 0)
                 {
@@ -230,67 +230,67 @@ void ObjTable::doMouseEvent(
             }
         }
     }
-    me.mx += (horizontalScrollBar && hatStyle(Style::HScroll))
+    me.mx += (horizontalScrollBar && hasStyle(Style::HScroll))
                ? horizontalScrollBar->getScroll()
                : 0;
-    me.my += (vertikalScrollBar && hatStyle(Style::VScroll))
+    me.my += (vertikalScrollBar && hasStyle(Style::VScroll))
                ? vertikalScrollBar->getScroll()
                : 0;
-    bool vs = hatStyle(Style::VScroll) && vertikalScrollBar;
-    bool hs = hatStyle(Style::HScroll) && horizontalScrollBar;
-    int rbr = rahmen ? rahmen->getRBreite() : 0;
+    bool vs = hasStyle(Style::VScroll) && vertikalScrollBar;
+    bool hs = hasStyle(Style::HScroll) && horizontalScrollBar;
+    int rbr = border ? border->getRWidth() : 0;
     if (vs)
     {
         if (hs)
-            horizontalScrollBar->doMausMessage(
+            horizontalScrollBar->doMouseMessage(
                 rbr, gr.y - 15 - rbr, gr.x - 15 - rbr * 2, 15, me);
-        vertikalScrollBar->doMausMessage(
+        vertikalScrollBar->doMouseMessage(
             gr.x - 15 - rbr, rbr, 15, gr.y - rbr * 2, me);
     }
     else if (hs)
-        horizontalScrollBar->doMausMessage(
+        horizontalScrollBar->doMouseMessage(
             rbr, gr.y - 15 - rbr, gr.x - rbr * 2, 15, me);
-    if (aufScroll) me.verarbeitet = 1;
-    if (me.id != ME_Betritt && me.id != ME_Leaves)
+    if (aufScroll) me.processed = 1;
+    if (me.id != ME_Enter && me.id != ME_Leaves)
     {
         for (int i = 0; i < zeilenAnzahl; ++i)
         {
             for (int j = 0; j < spaltenAnzahl; ++j)
             {
-                bool b = me.verarbeitet;
+                bool b = me.processed;
                 Drawable* obj = zDrawable(j, i);
                 if (obj) obj->doPublicMouseEvent(me);
-                if (!b && me.verarbeitet && me.id == ME_PLinks)
-                    selected = Punkt(j, i);
+                if (!b && me.processed && me.id == ME_PLeft)
+                    selected = Point(j, i);
             }
         }
     }
     unlockDrawable();
-    me.verarbeitet = 1;
+    me.processed = 1;
     me.mx = tmx;
     me.my = tmy;
 }
 
 // non-constant
-void ObjTable::addSpalte(const char* name) // add column
+void ObjTable::addColumn(const char* name) // add column
 {
-    addSpalte(spaltenAnzahl, name);
+    addColumn(spaltenAnzahl, name);
 }
 
-void ObjTable::addSpalte(Text* name)
+void ObjTable::addColumn(Text* name)
 {
-    addSpalte(spaltenAnzahl, name);
+    addColumn(spaltenAnzahl, name);
 }
 
-void ObjTable::addSpalte(int sNum, const char* name) // insert column at sNum
+void ObjTable::addColumn(int sNum, const char* name) // insert column at sNum
 {
     if (sNum > spaltenAnzahl) return;
     lockDrawable();
     members->add(new RCArray<Drawable>(), sNum);
     spaltenNamen->add(new Text(name), sNum);
-    spaltenBreite->add(100, sNum);
-    minSpaltenBreite->add(0, sNum);
-    maxSpaltenBreite->add(300, sNum);
+    columnWidth->add(100, sNum);
+    minSpaltenWidth->add(0, sNum);
+    maxSpaltenWidth->add(300, sNum);
     msaRam->add(new RCArray<Border>(), sNum);
     msaAf->add(new RCArray<AlphaField>(), sNum);
     styles->add(new Array<__int64>(), sNum);
@@ -306,23 +306,23 @@ void ObjTable::addSpalte(int sNum, const char* name) // insert column at sNum
     unlockDrawable();
 }
 
-void ObjTable::addSpalte(int sNum, Text* name)
+void ObjTable::addColumn(int sNum, Text* name)
 {
-    addSpalte(sNum, name->getText());
+    addColumn(sNum, name->getText());
     name->release();
 }
 
-void ObjTable::addZeile(const char* name) // add row
+void ObjTable::addRow(const char* name) // add row
 {
-    addZeile(zeilenAnzahl, name);
+    addRow(zeilenAnzahl, name);
 }
 
-void ObjTable::addZeile(Text* name)
+void ObjTable::addRow(Text* name)
 {
-    addZeile(zeilenAnzahl, name);
+    addRow(zeilenAnzahl, name);
 }
 
-void ObjTable::addZeile(int zNum, const char* name) // insert row at zNum
+void ObjTable::addRow(int zNum, const char* name) // insert row at zNum
 {
     if (zNum > zeilenAnzahl) return;
     lockDrawable();
@@ -342,21 +342,21 @@ void ObjTable::addZeile(int zNum, const char* name) // insert row at zNum
     unlockDrawable();
 }
 
-void ObjTable::addZeile(int zNum, Text* name)
+void ObjTable::addRow(int zNum, Text* name)
 {
-    addZeile(zNum, name->getText());
+    addRow(zNum, name->getText());
     name->release();
 }
 
-void ObjTable::removeSpalte(int sNum) // delete column
+void ObjTable::removeColumn(int sNum) // delete column
 {
     if (sNum >= spaltenAnzahl) return;
     lockDrawable();
     members->remove(sNum);
     spaltenNamen->remove(sNum);
-    spaltenBreite->remove(sNum);
-    minSpaltenBreite->remove(sNum);
-    maxSpaltenBreite->remove(sNum);
+    columnWidth->remove(sNum);
+    minSpaltenWidth->remove(sNum);
+    maxSpaltenWidth->remove(sNum);
     if (msaRam->z(sNum)) msaRam->z(sNum)->release();
     msaRam->remove(sNum);
     if (msaAf->z(sNum)) msaAf->z(sNum)->release();
@@ -367,17 +367,17 @@ void ObjTable::removeSpalte(int sNum) // delete column
     unlockDrawable();
 }
 
-void ObjTable::removeSpalte(const char* name)
+void ObjTable::removeColumn(const char* name)
 {
-    removeSpalte(getSpaltenNummer(name));
+    removeColumn(getColumnNumber(name));
 }
 
-void ObjTable::removeSpalte(Text* name)
+void ObjTable::removeColumn(Text* name)
 {
-    removeSpalte(getSpaltenNummer(name));
+    removeColumn(getColumnNumber(name));
 }
 
-void ObjTable::removeZeile(int zNum) // delete row
+void ObjTable::removeRow(int zNum) // delete row
 {
     if (zNum >= zeilenAnzahl) return;
     lockDrawable();
@@ -397,28 +397,28 @@ void ObjTable::removeZeile(int zNum) // delete row
     unlockDrawable();
 }
 
-void ObjTable::removeZeile(const char* name)
+void ObjTable::removeRow(const char* name)
 {
-    removeZeile(getZeilenNummer(name));
+    removeRow(getRowNumber(name));
 }
 
-void ObjTable::removeZeile(Text* name)
+void ObjTable::removeRow(Text* name)
 {
-    removeZeile(getZeilenNummer(name));
+    removeRow(getRowNumber(name));
 }
 
-void ObjTable::setSpaltePosition(
+void ObjTable::setColumnPosition(
     const char* name, int pos) // sets the position of a column
 {
-    setSpaltePosition(getSpaltenNummer(name), pos);
+    setColumnPosition(getColumnNumber(name), pos);
 }
 
-void ObjTable::setSpaltePosition(Text* name, int pos)
+void ObjTable::setColumnPosition(Text* name, int pos)
 {
-    setSpaltePosition(getSpaltenNummer(name), pos);
+    setColumnPosition(getColumnNumber(name), pos);
 }
 
-void ObjTable::setSpaltePosition(int sNum, int pos)
+void ObjTable::setColumnPosition(int sNum, int pos)
 {
     if (sNum >= spaltenAnzahl || pos >= spaltenAnzahl || sNum == pos) return;
     int delPos = sNum;
@@ -432,13 +432,13 @@ void ObjTable::setSpaltePosition(int sNum, int pos)
     members->remove(delPos);
     spaltenNamen->add(spaltenNamen->get(sNum), insertPos);
     spaltenNamen->remove(delPos);
-    spaltenBreite->add(
-        spaltenBreite->hat(sNum) ? spaltenBreite->get(sNum) : 0, insertPos);
-    spaltenBreite->remove(delPos);
-    minSpaltenBreite->add(
-        minSpaltenBreite->hat(sNum) ? minSpaltenBreite->get(sNum) : 0,
+    columnWidth->add(
+        columnWidth->has(sNum) ? columnWidth->get(sNum) : 0, insertPos);
+    columnWidth->remove(delPos);
+    minSpaltenWidth->add(
+        minSpaltenWidth->has(sNum) ? minSpaltenWidth->get(sNum) : 0,
         insertPos);
-    minSpaltenBreite->remove(delPos);
+    minSpaltenWidth->remove(delPos);
     msaRam->add(msaRam->z(sNum), insertPos);
     msaRam->remove(delPos);
     msaAf->add(msaAf->z(sNum), insertPos);
@@ -449,18 +449,18 @@ void ObjTable::setSpaltePosition(int sNum, int pos)
     unlockDrawable();
 }
 
-void ObjTable::setZeilePosition(
+void ObjTable::setRowPosition(
     const char* name, int pos) // sets the row position
 {
-    setZeilePosition(getZeilenNummer(name), pos);
+    setRowPosition(getRowNumber(name), pos);
 }
 
-void ObjTable::setZeilePosition(Text* name, int pos)
+void ObjTable::setRowPosition(Text* name, int pos)
 {
-    setZeilePosition(getZeilenNummer(name), pos);
+    setRowPosition(getRowNumber(name), pos);
 }
 
-void ObjTable::setZeilePosition(int zNum, int pos)
+void ObjTable::setRowPosition(int zNum, int pos)
 {
     if (zNum >= zeilenAnzahl || pos >= zeilenAnzahl || pos == zNum) return;
     int delPos = zNum;
@@ -473,20 +473,20 @@ void ObjTable::setZeilePosition(int zNum, int pos)
     zeilenNamen->add(zeilenNamen->get(zNum), insertPos);
     zeilenNamen->remove(delPos);
     zeilenHeight->add(
-        zeilenHeight->hat(zNum) ? zeilenHeight->get(zNum) : 0, insertPos);
+        zeilenHeight->has(zNum) ? zeilenHeight->get(zNum) : 0, insertPos);
     zeilenHeight->remove(delPos);
     minZeilenHeight->add(
-        minZeilenHeight->hat(zNum) ? minZeilenHeight->get(zNum) : 0, insertPos);
+        minZeilenHeight->has(zNum) ? minZeilenHeight->get(zNum) : 0, insertPos);
     minZeilenHeight->remove(delPos);
     maxZeilenHeight->add(
-        maxZeilenHeight->hat(zNum) ? maxZeilenHeight->get(zNum) : 0, insertPos);
+        maxZeilenHeight->has(zNum) ? maxZeilenHeight->get(zNum) : 0, insertPos);
     maxZeilenHeight->remove(delPos);
     for (int i = 0; i < spaltenAnzahl; ++i)
     {
         if (members->z(i))
         {
             members->z(i)->add(
-                members->z(i)->hat(zNum) ? members->z(i)->get(zNum) : 0,
+                members->z(i)->has(zNum) ? members->z(i)->get(zNum) : 0,
                 insertPos);
             members->z(i)->remove(delPos);
         }
@@ -505,7 +505,7 @@ void ObjTable::setZeilePosition(int zNum, int pos)
         if (styles->z(i))
         {
             styles->z(i)->add(
-                styles->z(i)->hat(zNum) ? styles->z(i)->get(zNum) : 0,
+                styles->z(i)->has(zNum) ? styles->z(i)->get(zNum) : 0,
                 insertPos);
             styles->z(i)->remove(delPos);
         }
@@ -523,11 +523,11 @@ void ObjTable::setDrawableZ(
     while (members->z(sNum)->getEntryCount() <= zNum)
         members->z(sNum)->add(0);
     members->z(sNum)->set(obj, zNum);
-    if (spaltenBreite->hat(sNum))
+    if (columnWidth->has(sNum))
     {
-        obj->setWidth(spaltenBreite->get(sNum));
+        obj->setWidth(columnWidth->get(sNum));
     }
-    if (zeilenHeight->hat(zNum))
+    if (zeilenHeight->has(zNum))
     {
         obj->setHeight(zeilenHeight->get(zNum));
     }
@@ -539,36 +539,36 @@ void ObjTable::setDrawableZ(
     const char* spaltenName, const char* zeilenName, Drawable* zDrawable)
 {
     setDrawableZ(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), zDrawable);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), zDrawable);
 }
 
 void ObjTable::setDrawableZ(
     Text* spaltenName, Text* zeilenName, Drawable* zDrawable)
 {
     setDrawableZ(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), zDrawable);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), zDrawable);
 }
 
-void ObjTable::setSpaltenBreite(int sNum, int br) // sets the column width
+void ObjTable::setColumnWidth(int sNum, int br) // sets the column width
 {
     if (sNum >= spaltenAnzahl) return;
     lockDrawable();
-    spaltenBreite->set(br, sNum);
+    columnWidth->set(br, sNum);
     rend = 1;
     unlockDrawable();
 }
 
-void ObjTable::setSpaltenBreite(const char* name, int br)
+void ObjTable::setColumnWidth(const char* name, int br)
 {
-    setSpaltenBreite(getSpaltenNummer(name), br);
+    setColumnWidth(getColumnNumber(name), br);
 }
 
-void ObjTable::setSpaltenBreite(Text* name, int br)
+void ObjTable::setColumnWidth(Text* name, int br)
 {
-    setSpaltenBreite(getSpaltenNummer(name), br);
+    setColumnWidth(getColumnNumber(name), br);
 }
 
-void ObjTable::setZeilenHeight(int zNum, int hi) // sets the row height
+void ObjTable::setRowHeight(int zNum, int hi) // sets the row height
 {
     if (zNum >= zeilenAnzahl) return;
     lockDrawable();
@@ -577,57 +577,57 @@ void ObjTable::setZeilenHeight(int zNum, int hi) // sets the row height
     unlockDrawable();
 }
 
-void ObjTable::setZeilenHeight(const char* name, int hi)
+void ObjTable::setRowHeight(const char* name, int hi)
 {
-    setZeilenHeight(getZeilenNummer(name), hi);
+    setRowHeight(getRowNumber(name), hi);
 }
 
-void ObjTable::setZeilenHeight(Text* name, int hi)
+void ObjTable::setRowHeight(Text* name, int hi)
 {
-    setZeilenHeight(getZeilenNummer(name), hi);
+    setRowHeight(getRowNumber(name), hi);
 }
 
-void ObjTable::setMinSpaltenBreite(
+void ObjTable::setMinColumnWidth(
     int sNum, int minBr) // sets the minimum column width
 {
     if (sNum >= spaltenAnzahl) return;
     lockDrawable();
-    minSpaltenBreite->set(minBr, sNum);
+    minSpaltenWidth->set(minBr, sNum);
     rend = 1;
     unlockDrawable();
 }
 
-void ObjTable::setMinSpaltenBreite(const char* name, int minBr)
+void ObjTable::setMinColumnWidth(const char* name, int minBr)
 {
-    setMinSpaltenBreite(getSpaltenNummer(name), minBr);
+    setMinColumnWidth(getColumnNumber(name), minBr);
 }
 
-void ObjTable::setMinSpaltenBreite(Text* name, int minBr)
+void ObjTable::setMinColumnWidth(Text* name, int minBr)
 {
-    setMinSpaltenBreite(getSpaltenNummer(name), minBr);
+    setMinColumnWidth(getColumnNumber(name), minBr);
 }
 
-void ObjTable::setMaxSpaltenBreite(
+void ObjTable::setMaxColumnWidth(
     int sNum, int maxBr) // sets the maximum column width
 {
     if (sNum >= spaltenAnzahl) return;
     lockDrawable();
-    maxSpaltenBreite->set(maxBr, sNum);
+    maxSpaltenWidth->set(maxBr, sNum);
     rend = 1;
     unlockDrawable();
 }
 
-void ObjTable::setMaxSpaltenBreite(const char* name, int maxBr)
+void ObjTable::setMaxColumnWidth(const char* name, int maxBr)
 {
-    setMaxSpaltenBreite(getSpaltenNummer(name), maxBr);
+    setMaxColumnWidth(getColumnNumber(name), maxBr);
 }
 
-void ObjTable::setMaxSpaltenBreite(Text* name, int maxBr)
+void ObjTable::setMaxColumnWidth(Text* name, int maxBr)
 {
-    setMaxSpaltenBreite(getSpaltenNummer(name), maxBr);
+    setMaxColumnWidth(getColumnNumber(name), maxBr);
 }
 
-void ObjTable::setMinZeilenHeight(
+void ObjTable::setMinRowHeight(
     int zNum, int minHi) // sets the minimum row height
 {
     if (zNum >= zeilenAnzahl) return;
@@ -637,17 +637,17 @@ void ObjTable::setMinZeilenHeight(
     unlockDrawable();
 }
 
-void ObjTable::setMinZeilenHeight(const char* name, int minHi)
+void ObjTable::setMinRowHeight(const char* name, int minHi)
 {
-    setMinZeilenHeight(getZeilenNummer(name), minHi);
+    setMinRowHeight(getRowNumber(name), minHi);
 }
 
-void ObjTable::setMinZeilenHeight(Text* name, int minHi)
+void ObjTable::setMinRowHeight(Text* name, int minHi)
 {
-    setMinZeilenHeight(getZeilenNummer(name), minHi);
+    setMinRowHeight(getRowNumber(name), minHi);
 }
 
-void ObjTable::setMaxZeilenHeight(
+void ObjTable::setMaxRowHeight(
     int zNum, int maxHi) // sets the maximum row height
 {
     if (zNum >= zeilenAnzahl) return;
@@ -657,17 +657,17 @@ void ObjTable::setMaxZeilenHeight(
     unlockDrawable();
 }
 
-void ObjTable::setMaxZeilenHeight(const char* name, int maxHi)
+void ObjTable::setMaxRowHeight(const char* name, int maxHi)
 {
-    setMaxZeilenHeight(getZeilenHeight(name), maxHi);
+    setMaxRowHeight(getRowHeight(name), maxHi);
 }
 
-void ObjTable::setMaxZeilenHeight(Text* name, int maxHi)
+void ObjTable::setMaxRowHeight(Text* name, int maxHi)
 {
-    setMaxZeilenHeight(getZeilenHeight(name), maxHi);
+    setMaxRowHeight(getRowHeight(name), maxHi);
 }
 
-void ObjTable::setAuswahl(
+void ObjTable::setSelection(
     int sNum, int zNum) // selects the corresponding field
 {
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
@@ -678,25 +678,25 @@ void ObjTable::setAuswahl(
     unlockDrawable();
 }
 
-void ObjTable::setAuswahl(const char* spaltenName, const char* zeilenName)
+void ObjTable::setSelection(const char* spaltenName, const char* zeilenName)
 {
-    setAuswahl(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+    setSelection(getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
-void ObjTable::setAuswahl(Text* spaltenName, Text* zeilenName)
+void ObjTable::setSelection(Text* spaltenName, Text* zeilenName)
 {
-    setAuswahl(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+    setSelection(getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
-void ObjTable::setRasterFarbe(int f) // sets the grid color
+void ObjTable::setGridColor(int f) // sets the grid color
 {
-    rasterFarbe = f;
+    rasterColor = f;
     rend = 1;
 }
 
-void ObjTable::setRasterBreite(int br) // sets the width of the grid
+void ObjTable::setGridWidth(int br) // sets the width of the grid
 {
-    rasterBreite = br;
+    gridWidth = br;
     rend = 1;
 }
 
@@ -707,17 +707,17 @@ void ObjTable::setABorderZ(Border* ram) // sets the selection border
     rend = 1;
 }
 
-void ObjTable::setARFarbe(int f) // sets the selection border color
+void ObjTable::setARColor(int f) // sets the selection border color
 {
     if (!aRam) aRam = new LBorder();
-    aRam->setFarbe(f);
+    aRam->setColor(f);
     rend = 1;
 }
 
-void ObjTable::setARBreite(int br) // sets the selection border width
+void ObjTable::setARWidth(int br) // sets the selection border width
 {
     if (!aRam) aRam = new LBorder();
-    aRam->setRamenBreite(br);
+    aRam->setBorderWidth(br);
     rend = 1;
 }
 
@@ -728,10 +728,10 @@ void ObjTable::setAAlphaFieldZ(AlphaField* af) // sets the selection AlphaField
     rend = 1;
 }
 
-void ObjTable::setAAfFarbe(int f) // sets the color of the selection AlphaField
+void ObjTable::setAAfColor(int f) // sets the color of the selection AlphaField
 {
     if (!aAf) aAf = new AlphaField();
-    aAf->setFarbe(f);
+    aAf->setColor(f);
     rend = 1;
 }
 
@@ -754,16 +754,16 @@ void ObjTable::setABorderZ(
     const char* spaltenName, const char* zeilenName, Border* ram)
 {
     setABorderZ(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), ram);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), ram);
 }
 
 void ObjTable::setABorderZ(Text* spaltenName, Text* zeilenName, Border* ram)
 {
     setABorderZ(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), ram);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), ram);
 }
 
-void ObjTable::setARFarbe(
+void ObjTable::setARColor(
     int sNum, int zNum, int f) // sets the selection border color
 {
     if (msaRam->z(sNum))
@@ -774,23 +774,23 @@ void ObjTable::setARFarbe(
             tmp = new LBorder();
             msaRam->z(sNum)->set(tmp, zNum);
         }
-        tmp->setFarbe(f);
+        tmp->setColor(f);
         rend = 1;
     }
 }
 
-void ObjTable::setARFarbe(
+void ObjTable::setARColor(
     const char* spaltenName, const char* zeilenName, int f)
 {
-    setARFarbe(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), f);
+    setARColor(getColumnNumber(spaltenName), getRowNumber(zeilenName), f);
 }
 
-void ObjTable::setARFarbe(Text* spaltenName, Text* zeilenName, int f)
+void ObjTable::setARColor(Text* spaltenName, Text* zeilenName, int f)
 {
-    setARFarbe(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), f);
+    setARColor(getColumnNumber(spaltenName), getRowNumber(zeilenName), f);
 }
 
-void ObjTable::setARBreite(
+void ObjTable::setARWidth(
     int sNum, int zNum, int br) // sets the selection border width
 {
     if (msaRam->z(sNum))
@@ -801,20 +801,20 @@ void ObjTable::setARBreite(
             tmp = new LBorder();
             msaRam->z(sNum)->set(tmp, zNum);
         }
-        tmp->setRamenBreite(br);
+        tmp->setBorderWidth(br);
         rend = 1;
     }
 }
 
-void ObjTable::setARBreite(
+void ObjTable::setARWidth(
     const char* spaltenName, const char* zeilenName, int br)
 {
-    setARBreite(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), br);
+    setARWidth(getColumnNumber(spaltenName), getRowNumber(zeilenName), br);
 }
 
-void ObjTable::setARBreite(Text* spaltenName, Text* zeilenName, int br)
+void ObjTable::setARWidth(Text* spaltenName, Text* zeilenName, int br)
 {
-    setARBreite(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), br);
+    setARWidth(getColumnNumber(spaltenName), getRowNumber(zeilenName), br);
 }
 
 void ObjTable::setAAlphaFieldZ(
@@ -828,17 +828,17 @@ void ObjTable::setAAlphaFieldZ(
     const char* spaltenName, const char* zeilenName, AlphaField* af)
 {
     setAAlphaFieldZ(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), af);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), af);
 }
 
 void ObjTable::setAAlphaFieldZ(
     Text* spaltenName, Text* zeilenName, AlphaField* af)
 {
     setAAlphaFieldZ(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), af);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), af);
 }
 
-void ObjTable::setAAfFarbe(
+void ObjTable::setAAfColor(
     int sNum, int zNum, int f) // sets the color of the selection AlphaField
 {
     if (msaAf->z(sNum))
@@ -849,20 +849,20 @@ void ObjTable::setAAfFarbe(
             tmp = new AlphaField();
             msaAf->z(sNum)->set(tmp, zNum);
         }
-        tmp->setFarbe(f);
+        tmp->setColor(f);
         rend = 1;
     }
 }
 
-void ObjTable::setAAfFarbe(
+void ObjTable::setAAfColor(
     const char* spaltenName, const char* zeilenName, int f)
 {
-    setAAfFarbe(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), f);
+    setAAfColor(getColumnNumber(spaltenName), getRowNumber(zeilenName), f);
 }
 
-void ObjTable::setAAfFarbe(Text* spaltenName, Text* zeilenName, int f)
+void ObjTable::setAAfColor(Text* spaltenName, Text* zeilenName, int f)
 {
-    setAAfFarbe(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), f);
+    setAAfColor(getColumnNumber(spaltenName), getRowNumber(zeilenName), f);
 }
 
 void ObjTable::setAAfStrength(
@@ -885,13 +885,13 @@ void ObjTable::setAAfStrength(
     const char* spaltenName, const char* zeilenName, int st)
 {
     setAAfStrength(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), st);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), st);
 }
 
 void ObjTable::setAAfStrength(Text* spaltenName, Text* zeilenName, int st)
 {
     setAAfStrength(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), st);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), st);
 }
 
 void ObjTable::addMsStyle(
@@ -900,7 +900,7 @@ void ObjTable::addMsStyle(
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
     if (styles->z(sNum))
         styles->z(sNum)->set(
-            (styles->z(sNum)->hat(zNum) ? styles->z(sNum)->get(zNum) : 0)
+            (styles->z(sNum)->has(zNum) ? styles->z(sNum)->get(zNum) : 0)
                 | style,
             zNum);
     rend = 1;
@@ -910,13 +910,13 @@ void ObjTable::addMsStyle(
     const char* spaltenName, const char* zeilenName, __int64 style)
 {
     addMsStyle(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
 void ObjTable::addMsStyle(Text* spaltenName, Text* zeilenName, __int64 style)
 {
     addMsStyle(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
 void ObjTable::setMsStyle(int sNum, int zNum, __int64 style)
@@ -930,13 +930,13 @@ void ObjTable::setMsStyle(
     const char* spaltenName, const char* zeilenName, __int64 style)
 {
     setMsStyle(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
 void ObjTable::setMsStyle(Text* spaltenName, Text* zeilenName, __int64 style)
 {
     setMsStyle(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
 void ObjTable::setMsStyle(int sNum, int zNum, __int64 style, bool add_remove)
@@ -946,12 +946,12 @@ void ObjTable::setMsStyle(int sNum, int zNum, __int64 style, bool add_remove)
     {
         if (add_remove)
             styles->z(sNum)->set(
-                (styles->z(sNum)->hat(zNum) ? styles->z(sNum)->get(zNum) : 0)
+                (styles->z(sNum)->has(zNum) ? styles->z(sNum)->get(zNum) : 0)
                     | style,
                 zNum);
         else
             styles->z(sNum)->set(
-                (styles->z(sNum)->hat(zNum) ? styles->z(sNum)->get(zNum) : 0)
+                (styles->z(sNum)->has(zNum) ? styles->z(sNum)->get(zNum) : 0)
                     & (~style),
                 zNum);
         rend = 1;
@@ -963,8 +963,8 @@ void ObjTable::setMsStyle(const char* spaltenName,
     __int64 style,
     bool add_remove)
 {
-    setMsStyle(getSpaltenNummer(spaltenName),
-        getZeilenNummer(zeilenName),
+    setMsStyle(getColumnNumber(spaltenName),
+        getRowNumber(zeilenName),
         style,
         add_remove);
 }
@@ -972,8 +972,8 @@ void ObjTable::setMsStyle(const char* spaltenName,
 void ObjTable::setMsStyle(
     Text* spaltenName, Text* zeilenName, __int64 style, bool add_remove)
 {
-    setMsStyle(getSpaltenNummer(spaltenName),
-        getZeilenNummer(zeilenName),
+    setMsStyle(getColumnNumber(spaltenName),
+        getRowNumber(zeilenName),
         style,
         add_remove);
 }
@@ -983,7 +983,7 @@ void ObjTable::removeMsStyle(int sNum, int zNum, __int64 style)
     if (sNum >= spaltenAnzahl || zNum >= zeilenAnzahl) return;
     if (styles->z(sNum))
         styles->z(sNum)->set(
-            (styles->z(sNum)->hat(zNum) ? styles->z(sNum)->get(zNum) : 0)
+            (styles->z(sNum)->has(zNum) ? styles->z(sNum)->get(zNum) : 0)
                 & (~style),
             zNum);
     rend = 1;
@@ -993,14 +993,14 @@ void ObjTable::removeMsStyle(
     const char* spaltenName, const char* zeilenName, __int64 style)
 {
     removeMsStyle(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
 void ObjTable::removeMsStyle(
     Text* spaltenName, Text* zeilenName, __int64 style)
 {
     removeMsStyle(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
 bool ObjTable::tick(double tickVal) // tick Message
@@ -1020,17 +1020,17 @@ bool ObjTable::tick(double tickVal) // tick Message
 
 void ObjTable::doKeyboardEvent(KeyboardEvent& te)
 {
-    bool ntakc = !te.verarbeitet;
-    if (hatStyleNicht(Style::Fokus) || hatStyleNicht(Style::Erlaubt)
-        || hatStyleNicht(Style::Sichtbar))
+    bool ntakc = !te.processed;
+    if (hasStyleNot(Style::Focus) || hasStyleNot(Style::Allowed)
+        || hasStyleNot(Style::Visible))
         return;
-    if (tak && (te.verarbeitet || tak(takParam, this, te)))
+    if (tak && (te.processed || tak(takParam, this, te)))
     {
         lockDrawable();
         if (zDrawable(selected.x, selected.y))
         {
             zDrawable(selected.x, selected.y)->doKeyboardEvent(te);
-            if (!te.verarbeitet && te.id == TE_Press)
+            if (!te.processed && te.id == TE_Press)
             {
                 if (te.virtualKey == T_Oben)
                 {
@@ -1056,14 +1056,14 @@ void ObjTable::doKeyboardEvent(KeyboardEvent& te)
         }
         unlockDrawable();
     }
-    te.verarbeitet = 1;
-    if (ntakc && te.verarbeitet && nTak)
-        te.verarbeitet = nTak(ntakParam, this, te);
+    te.processed = 1;
+    if (ntakc && te.processed && nTak)
+        te.processed = nTak(ntakParam, this, te);
 }
 
 void ObjTable::render(Image& zRObj) // renders the table into zRObj
 {
-    if (hatStyleNicht(Style::Sichtbar)) return;
+    if (hasStyleNot(Style::Visible)) return;
     DrawableBackground::render(zRObj);
     lockDrawable();
     if (!zRObj.setDrawOptions(innenPosition, innenSize))
@@ -1072,39 +1072,39 @@ void ObjTable::render(Image& zRObj) // renders the table into zRObj
         return;
     }
     int xPos = 0;
-    if (horizontalScrollBar && hatStyle(Style::HScroll))
+    if (horizontalScrollBar && hasStyle(Style::HScroll))
         xPos -= horizontalScrollBar->getScroll();
     for (int s = 0; s < spaltenAnzahl; ++s)
     {
-        int sBr = spaltenBreite->hat(s) ? spaltenBreite->get(s) : 0;
+        int sBr = columnWidth->has(s) ? columnWidth->get(s) : 0;
         int yPos = 0;
-        if (vertikalScrollBar && hatStyle(Style::VScroll))
+        if (vertikalScrollBar && hasStyle(Style::VScroll))
             yPos -= vertikalScrollBar->getScroll();
         RCArray<Drawable>* tmp_zDrawables = members->z(s);
         if (!tmp_zDrawables) continue;
         for (int z = 0; z < zeilenAnzahl && tmp_zDrawables; ++z)
         {
-            int zHi = zeilenHeight->hat(z) ? zeilenHeight->get(z) : 0;
-            if (hatStyle(Style::Raster)) yPos += rasterBreite;
+            int zHi = zeilenHeight->has(z) ? zeilenHeight->get(z) : 0;
+            if (hasStyle(Style::Raster)) yPos += gridWidth;
             yPos += zHi;
             if (z == zeilenAnzahl - 1 && vertikalScrollBar
-                && hatStyle(Style::VScroll))
+                && hasStyle(Style::VScroll))
                 vertikalScrollBar->getScrollData()->max
                     = yPos + vertikalScrollBar->getScroll();
         }
         for (int z = zeilenAnzahl - 1; z >= 0 && tmp_zDrawables; z--)
         {
-            int zHi = zeilenHeight->hat(z) ? zeilenHeight->get(z) : 0;
+            int zHi = zeilenHeight->has(z) ? zeilenHeight->get(z) : 0;
             yPos -= zHi;
-            if (hatStyle(Style::Raster))
+            if (hasStyle(Style::Raster))
             {
-                yPos -= rasterBreite;
-                for (int i = 0; i < rasterBreite; i++)
-                    zRObj.drawLinieHAlpha(
-                        xPos, yPos + zHi + i, sBr, rasterFarbe);
+                yPos -= gridWidth;
+                for (int i = 0; i < gridWidth; i++)
+                    zRObj.drawLineHAlpha(
+                        xPos, yPos + zHi + i, sBr, rasterColor);
             }
             Drawable* obj
-                = tmp_zDrawables->hat(z) ? tmp_zDrawables->z(z) : 0;
+                = tmp_zDrawables->has(z) ? tmp_zDrawables->z(z) : 0;
             if (obj)
             {
                 obj->setPosition(xPos, yPos);
@@ -1114,16 +1114,16 @@ void ObjTable::render(Image& zRObj) // renders the table into zRObj
                 {
                     Border* tmp_aRam = aRam;
                     AlphaField* tmp_aAf = aAf;
-                    bool aRamB = hatStyle(Style::SelectionBorder) && tmp_aRam;
-                    bool aAfB = hatStyle(Style::AuswahlBuffer) && tmp_aAf;
-                    if (hatStyle(Style::AuswahlMultistyled))
+                    bool aRamB = hasStyle(Style::SelectionBorder) && tmp_aRam;
+                    bool aAfB = hasStyle(Style::SelectionBuffer) && tmp_aAf;
+                    if (hasStyle(Style::SelectionMultistyled))
                     {
                         tmp_aRam = getABorder(s, z);
                         tmp_aAf = getAAlphaField(s, z);
-                        aRamB = hatMsStyle(s, z, Style::SelectionBorder)
+                        aRamB = hasMsStyle(s, z, Style::SelectionBorder)
                              && tmp_aRam;
                         aAfB
-                            = hatMsStyle(s, z, Style::AuswahlBuffer) && tmp_aAf;
+                            = hasMsStyle(s, z, Style::SelectionBuffer) && tmp_aAf;
                     }
                     int aRbr = 0;
                     if (aRamB)
@@ -1131,7 +1131,7 @@ void ObjTable::render(Image& zRObj) // renders the table into zRObj
                         tmp_aRam->setPosition(xPos, yPos);
                         tmp_aRam->setSize(sBr, zHi);
                         tmp_aRam->render(zRObj);
-                        aRbr = tmp_aRam->getRBreite();
+                        aRbr = tmp_aRam->getRWidth();
                     }
                     if (aAfB)
                     {
@@ -1142,16 +1142,16 @@ void ObjTable::render(Image& zRObj) // renders the table into zRObj
                 }
             }
         }
-        if (hatStyle(Style::Raster))
+        if (hasStyle(Style::Raster))
         {
-            for (int i = 0; i < rasterBreite; i++)
-                zRObj.drawLinieVAlpha(
-                    xPos + sBr + i, 0, innenSize.y, rasterFarbe);
-            xPos += rasterBreite;
+            for (int i = 0; i < gridWidth; i++)
+                zRObj.drawLineVAlpha(
+                    xPos + sBr + i, 0, innenSize.y, rasterColor);
+            xPos += gridWidth;
         }
         xPos += sBr;
     }
-    if (horizontalScrollBar && hatStyle(Style::HScroll))
+    if (horizontalScrollBar && hasStyle(Style::HScroll))
         horizontalScrollBar->getScrollData()->max
             = xPos + horizontalScrollBar->getScroll();
     zRObj.releaseDrawOptions();
@@ -1159,83 +1159,83 @@ void ObjTable::render(Image& zRObj) // renders the table into zRObj
 }
 
 // constant
-int ObjTable::getSpaltenAnzahl() const // returns the number of columns
+int ObjTable::getColumnCount() const // returns the number of columns
 {
     return spaltenAnzahl;
 }
 
-int ObjTable::getZeilenAnzahl() const // returns the number of rows
+int ObjTable::getRowCount() const // returns the number of rows
 {
     return zeilenAnzahl;
 }
 
-int ObjTable::getSpaltenNummer(
+int ObjTable::getColumnNumber(
     const char* name) const // returns the index of the column with the name
 {
     for (int i = 0; i < spaltenAnzahl; ++i)
     {
-        if (spaltenNamen->z(i)->istGleich(name)) return i;
+        if (spaltenNamen->z(i)->isEqual(name)) return i;
     }
     return -1;
 }
 
-int ObjTable::getSpaltenNummer(Text* name) const
+int ObjTable::getColumnNumber(Text* name) const
 {
-    int ret = getSpaltenNummer(name->getText());
+    int ret = getColumnNumber(name->getText());
     name->release();
     return ret;
 }
 
-Text* ObjTable::getSpaltenName(
+Text* ObjTable::getColumnName(
     int num) const // returns the name of the column with index num
 {
     return spaltenNamen->get(num);
 }
 
-Text* ObjTable::zSpaltenName(int num) const
+Text* ObjTable::zColumnName(int num) const
 {
     return spaltenNamen->z(num);
 }
 
-int ObjTable::getZeilenNummer(
+int ObjTable::getRowNumber(
     const char* name) const // returns the index of the row with the name
 {
     for (int i = 0; i < zeilenAnzahl; ++i)
     {
-        if (zeilenNamen->z(i)->istGleich(name)) return i;
+        if (zeilenNamen->z(i)->isEqual(name)) return i;
     }
     return -1;
 }
 
-int ObjTable::getZeilenNummer(Text* name) const
+int ObjTable::getRowNumber(Text* name) const
 {
-    int ret = getZeilenNummer(name->getText());
+    int ret = getRowNumber(name->getText());
     name->release();
     return ret;
 }
 
-Text* ObjTable::getZeilenName(
+Text* ObjTable::getRowName(
     int num) const // returns the name of the row with index num
 {
     return zeilenNamen->get(num);
 }
 
-Text* ObjTable::zZeilenName(int num) const
+Text* ObjTable::zRowName(int num) const
 {
     return zeilenNamen->z(num);
 }
 
-Punkt ObjTable::getDrawablePosition(
+Point ObjTable::getDrawablePosition(
     Drawable* zObj) const // returns the position of a drawing
 {
     for (int x = 0; x < spaltenAnzahl; ++x)
     {
         for (int y = 0; y < zeilenAnzahl; ++y)
         {
-            if (zDrawable(x, y) == zObj) return Punkt(x, y);
+            if (zDrawable(x, y) == zObj) return Point(x, y);
         }
     }
-    return Punkt(-1, -1);
+    return Point(-1, -1);
 }
 
 Drawable* ObjTable::zDrawable(
@@ -1245,7 +1245,7 @@ Drawable* ObjTable::zDrawable(
         return 0;
     if (!members->z(sNum)) return 0;
     RCArray<Drawable>* tmp = members->z(sNum);
-    if (!tmp->hat(zNum)) return 0;
+    if (!tmp->has(zNum)) return 0;
     return tmp ? tmp->z(zNum) : 0;
 }
 
@@ -1253,13 +1253,13 @@ Drawable* ObjTable::zDrawable(
     const char* spaltenName, const char* zeilenName) const
 {
     return zDrawable(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 Drawable* ObjTable::zDrawable(Text* spaltenName, Text* zeilenName) const
 {
     return zDrawable(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 Drawable* ObjTable::getDrawable(
@@ -1267,7 +1267,7 @@ Drawable* ObjTable::getDrawable(
 {
     if (!members->z(sNum)) return 0;
     RCArray<Drawable>* tmp = members->z(sNum);
-    if (!tmp->hat(zNum)) return 0;
+    if (!tmp->has(zNum)) return 0;
     return tmp ? tmp->get(zNum) : 0;
 }
 
@@ -1275,192 +1275,192 @@ Drawable* ObjTable::getDrawable(
     const char* spaltenName, const char* zeilenName) const
 {
     return getDrawable(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 Drawable* ObjTable::getDrawable(Text* spaltenName, Text* zeilenName) const
 {
     return getDrawable(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
-int ObjTable::getSpaltenBreite(
+int ObjTable::getColumnWidth(
     int num) const // returns the width of the column
 {
-    return spaltenBreite->get(num);
+    return columnWidth->get(num);
 }
 
-int ObjTable::getSpaltenBreite(const char* name) const
+int ObjTable::getColumnWidth(const char* name) const
 {
-    return getSpaltenBreite(getSpaltenNummer(name));
+    return getColumnWidth(getColumnNumber(name));
 }
 
-int ObjTable::getSpaltenBreite(Text* name) const
+int ObjTable::getColumnWidth(Text* name) const
 {
-    return getSpaltenBreite(getSpaltenNummer(name));
+    return getColumnWidth(getColumnNumber(name));
 }
 
-int ObjTable::getZeilenHeight(int num) const // returns the height of the row
+int ObjTable::getRowHeight(int num) const // returns the height of the row
 {
     return zeilenHeight->get(num);
 }
 
-int ObjTable::getZeilenHeight(const char* name) const
+int ObjTable::getRowHeight(const char* name) const
 {
-    return getZeilenHeight(getZeilenNummer(name));
+    return getRowHeight(getRowNumber(name));
 }
 
-int ObjTable::getZeilenHeight(Text* name) const
+int ObjTable::getRowHeight(Text* name) const
 {
-    return getZeilenHeight(getZeilenNummer(name));
+    return getRowHeight(getRowNumber(name));
 }
 
-int ObjTable::getMinSpaltenBreite(
+int ObjTable::getMinColumnWidth(
     int num) const // returns the minimum column width
 {
-    return minSpaltenBreite->get(num);
+    return minSpaltenWidth->get(num);
 }
 
-int ObjTable::getMinSpaltenBreite(const char* name) const
+int ObjTable::getMinColumnWidth(const char* name) const
 {
-    return getMinSpaltenBreite(getSpaltenNummer(name));
+    return getMinColumnWidth(getColumnNumber(name));
 }
 
-int ObjTable::getMinSpaltenBreite(Text* name) const
+int ObjTable::getMinColumnWidth(Text* name) const
 {
-    return getMinSpaltenBreite(getSpaltenNummer(name));
+    return getMinColumnWidth(getColumnNumber(name));
 }
 
-int ObjTable::getMaxSpaltenBreite(
+int ObjTable::getMaxColumnWidth(
     int num) const // returns the maximum column width
 {
-    return maxSpaltenBreite->get(num);
+    return maxSpaltenWidth->get(num);
 }
 
-int ObjTable::getMaxSpaltenBreite(const char* name) const
+int ObjTable::getMaxColumnWidth(const char* name) const
 {
-    return getMaxSpaltenBreite(getSpaltenNummer(name));
+    return getMaxColumnWidth(getColumnNumber(name));
 }
 
-int ObjTable::getMaxSpaltenBreite(Text* name) const
+int ObjTable::getMaxColumnWidth(Text* name) const
 {
-    return getMaxSpaltenBreite(getSpaltenNummer(name));
+    return getMaxColumnWidth(getColumnNumber(name));
 }
 
-int ObjTable::getMinZeilenHeight(
+int ObjTable::getMinRowHeight(
     int num) const // returns the minimum row height
 {
     return minZeilenHeight->get(num);
 }
 
-int ObjTable::getMinZeilenHeight(const char* name) const
+int ObjTable::getMinRowHeight(const char* name) const
 {
-    return getMinZeilenHeight(getZeilenNummer(name));
+    return getMinRowHeight(getRowNumber(name));
 }
 
-int ObjTable::getMinZeilenHeight(Text* name) const
+int ObjTable::getMinRowHeight(Text* name) const
 {
-    return getMinZeilenHeight(getZeilenNummer(name));
+    return getMinRowHeight(getRowNumber(name));
 }
 
-int ObjTable::getMaxZeilenHeight(
+int ObjTable::getMaxRowHeight(
     int num) const // returns the maximum row height
 {
     return maxZeilenHeight->get(num);
 }
 
-int ObjTable::getMaxZeilenHeight(const char* name) const
+int ObjTable::getMaxRowHeight(const char* name) const
 {
-    return getMaxZeilenHeight(getZeilenNummer(name));
+    return getMaxRowHeight(getRowNumber(name));
 }
 
-int ObjTable::getMaxZeilenHeight(Text* name) const
+int ObjTable::getMaxRowHeight(Text* name) const
 {
-    return getMaxZeilenHeight(getZeilenNummer(name));
+    return getMaxRowHeight(getRowNumber(name));
 }
 
-double ObjTable::getMausSpalte(
+double ObjTable::getMouseColumn(
     int mx) const // determines the column under the mouse
 {
     if (mx >= gr.x) return -1;
-    int hsBeg = (horizontalScrollBar && hatStyle(Style::HScroll))
+    int hsBeg = (horizontalScrollBar && hasStyle(Style::HScroll))
                   ? horizontalScrollBar->getScroll()
                   : 0;
     mx += hsBeg;
     if (mx < 0) return -1;
-    int xx = rahmen ? rahmen->getRBreite() : 0;
+    int xx = border ? border->getRWidth() : 0;
     for (int i = 0; i < spaltenAnzahl; ++i)
     {
-        xx += spaltenBreite->get(i);
+        xx += columnWidth->get(i);
         if (mx < xx - 5) return i;
         if (mx < xx + 5) return i + 0.5;
-        xx += rasterBreite;
+        xx += gridWidth;
     }
     return -1;
 }
 
-Text* ObjTable::getMausSpaltenName(int mx) const
+Text* ObjTable::getMouseColumnnName(int mx) const
 {
-    double tmp = getMausSpalte(mx);
+    double tmp = getMouseColumn(mx);
     if (tmp != (int)tmp) return 0;
-    return getSpaltenName((int)tmp);
+    return getColumnName((int)tmp);
 }
 
-Text* ObjTable::zMausSpaltenName(int mx) const
+Text* ObjTable::zMouseColumnName(int mx) const
 {
-    double tmp = getMausSpalte(mx);
+    double tmp = getMouseColumn(mx);
     if (tmp != (int)tmp) return 0;
-    return zSpaltenName((int)tmp);
+    return zColumnName((int)tmp);
 }
 
-double ObjTable::getMausZeile(
+double ObjTable::getMouseRow(
     int my) const // calculates the row under the mouse
 {
     if (my >= gr.y) return -1;
     if (my < 0) return -1;
-    int vsBeg = vertikalScrollBar && hatStyle(Style::VScroll)
+    int vsBeg = vertikalScrollBar && hasStyle(Style::VScroll)
                   ? vertikalScrollBar->getScroll()
                   : 0;
     my += vsBeg;
-    int yy = rahmen ? rahmen->getRBreite() : 0;
+    int yy = border ? border->getRWidth() : 0;
     for (int i = 0; i < zeilenAnzahl; ++i)
     {
         yy += zeilenHeight->get(i);
         if (my < yy - 5) return i;
         if (my < yy + 5) return i + 0.5;
-        yy += rasterBreite;
+        yy += gridWidth;
     }
     return -1;
 }
 
-Text* ObjTable::getMausZeilenName(int my) const
+Text* ObjTable::getMouseRownName(int my) const
 {
-    double tmp = getMausZeile(my);
+    double tmp = getMouseRow(my);
     if (tmp != (int)tmp) return 0;
-    return getZeilenName((int)tmp);
+    return getRowName((int)tmp);
 }
 
-Text* ObjTable::zMausZeilenName(int my) const
+Text* ObjTable::zMouseRowName(int my) const
 {
-    double tmp = getMausZeile(my);
+    double tmp = getMouseRow(my);
     if (tmp != (int)tmp) return 0;
-    return zZeilenName((int)tmp);
+    return zRowName((int)tmp);
 }
 
-const Punkt&
-ObjTable::getAuswahlPosition() const // returns the selection position
+const Point&
+ObjTable::getSelahlPosition() const // returns the selection position
 {
     return selected;
 }
 
-int ObjTable::getRasterFarbe() const // returns the color of the grid
+int ObjTable::getGridColor() const // returns the color of the grid
 {
-    return rasterFarbe;
+    return rasterColor;
 }
 
-int ObjTable::getRasterBreite() const // returns the width of the grid
+int ObjTable::getGridWidth() const // returns the width of the grid
 {
-    return rasterBreite;
+    return gridWidth;
 }
 
 Border* ObjTable::getABorder() const // returns the selection border
@@ -1512,106 +1512,106 @@ Border* ObjTable::getABorder(const char* spaltenName,
     const char* zeilenName) const // returns the selection border
 {
     return getABorder(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 Border* ObjTable::zABorder(
     const char* spaltenName, const char* zeilenName) const
 {
-    return zABorder(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+    return zABorder(getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 AlphaField* ObjTable::getAAlphaField(const char* spaltenName,
     const char* zeilenName) const // returns the selection AlphaField
 {
     return getAAlphaField(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 AlphaField* ObjTable::zAAlphaField(
     const char* spaltenName, const char* zeilenName) const
 {
     return zAAlphaField(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 Border* ObjTable::getABorder(
     Text* spaltenName, Text* zeilenName) const // returns the selection border
 {
     return getABorder(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 Border* ObjTable::zABorder(Text* spaltenName, Text* zeilenName) const
 {
-    return zABorder(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+    return zABorder(getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 AlphaField* ObjTable::getAAlphaField(Text* spaltenName,
     Text* zeilenName) const // returns the selection AlphaField
 {
     return getAAlphaField(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
 AlphaField* ObjTable::zAAlphaField(Text* spaltenName, Text* zeilenName) const
 {
     return zAAlphaField(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+        getColumnNumber(spaltenName), getRowNumber(zeilenName));
 }
 
-bool ObjTable::hatMsStyle(
+bool ObjTable::hasMsStyle(
     int sNum, int zNum, __int64 style) const // checks if style is present
 {
-    __int64 s = styles->z(sNum) && styles->z(sNum)->hat(zNum)
+    __int64 s = styles->z(sNum) && styles->z(sNum)->has(zNum)
                   ? styles->z(sNum)->get(zNum)
                   : 0;
     return (s | style) == s;
 }
 
-bool ObjTable::hatMsStyleNicht(int sNum,
+bool ObjTable::hasMsStyleNot(int sNum,
     int zNum,
     __int64 style) const // checks if style is not present
 {
-    __int64 s = styles->z(sNum) && styles->z(sNum)->hat(zNum)
+    __int64 s = styles->z(sNum) && styles->z(sNum)->has(zNum)
                   ? styles->z(sNum)->get(zNum)
                   : 0;
     return (s | style) != s;
 }
 
-bool ObjTable::hatMsStyle(const char* spaltenName,
+bool ObjTable::hasMsStyle(const char* spaltenName,
     const char* zeilenName,
     __int64 style) const // checks if style is present
 {
-    return hatMsStyle(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+    return hasMsStyle(
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
-bool ObjTable::hatMsStyleNicht(const char* spaltenName,
+bool ObjTable::hasMsStyleNot(const char* spaltenName,
     const char* zeilenName,
     __int64 style) const // checks if style is not present
 {
-    return hatMsStyleNicht(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+    return hasMsStyleNot(
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
-bool ObjTable::hatMsStyle(Text* spaltenName,
+bool ObjTable::hasMsStyle(Text* spaltenName,
     Text* zeilenName,
     __int64 style) const // checks if style is present
 {
-    return hatMsStyle(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+    return hasMsStyle(
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
-bool ObjTable::hatMsStyleNicht(Text* spaltenName,
+bool ObjTable::hasMsStyleNot(Text* spaltenName,
     Text* zeilenName,
     __int64 style) const // checks if style is not present
 {
-    return hatMsStyleNicht(
-        getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), style);
+    return hasMsStyleNot(
+        getColumnNumber(spaltenName), getRowNumber(zeilenName), style);
 }
 
-Drawable* ObjTable::dublizieren() const // Creates a copy of the table
+Drawable* ObjTable::duplicate() const // Creates a copy of the table
 {
     ObjTable* obj = new ObjTable();
     obj->setPosition(pos);
@@ -1620,52 +1620,52 @@ Drawable* ObjTable::dublizieren() const // Creates a copy of the table
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setStyle(style);
-    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
-    obj->setHintergrundFarbe(hintergrundFarbe);
-    if (hintergrundImage)
-        obj->setHintergrundImage(
-            dynamic_cast<Image*>(hintergrundImage->getThis()));
-    if (hintergrundFeld)
-        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
-    obj->setRasterFarbe(rasterFarbe);
-    obj->setRasterBreite(rasterBreite);
-    if (aRam) obj->setABorderZ((Border*)aRam->dublizieren());
-    if (aAf) obj->setAAlphaFieldZ((AlphaField*)aAf->dublizieren());
+    if (border) obj->setBorderZ((Border*)border->duplicate());
+    obj->setBackgroundColor(backgroundColor);
+    if (backgroundImage)
+        obj->setBackgroundImage(
+            dynamic_cast<Image*>(backgroundImage->getThis()));
+    if (backgroundFeld)
+        obj->setAlphaFieldZ((AlphaField*)backgroundFeld->duplicate());
+    obj->setGridColor(rasterColor);
+    obj->setGridWidth(gridWidth);
+    if (aRam) obj->setABorderZ((Border*)aRam->duplicate());
+    if (aAf) obj->setAAlphaFieldZ((AlphaField*)aAf->duplicate());
     for (int s = 0; s < spaltenAnzahl; ++s)
     {
-        obj->addSpalte(spaltenNamen->get(s));
-        if (spaltenBreite->hat(s))
-            obj->setSpaltenBreite(s, spaltenBreite->get(s));
-        if (minSpaltenBreite->hat(s))
-            obj->setMinSpaltenBreite(s, minSpaltenBreite->get(s));
-        if (maxSpaltenBreite->hat(s))
-            obj->setMaxSpaltenBreite(s, maxSpaltenBreite->get(s));
+        obj->addColumn(spaltenNamen->get(s));
+        if (columnWidth->has(s))
+            obj->setColumnWidth(s, columnWidth->get(s));
+        if (minSpaltenWidth->has(s))
+            obj->setMinColumnWidth(s, minSpaltenWidth->get(s));
+        if (maxSpaltenWidth->has(s))
+            obj->setMaxColumnWidth(s, maxSpaltenWidth->get(s));
         for (int z = 0; z < zeilenAnzahl; ++z)
         {
             if (!s)
             {
-                obj->addZeile(zeilenNamen->get(z));
-                if (zeilenHeight->hat(z))
-                    obj->setZeilenHeight(z, zeilenHeight->get(z));
-                if (minZeilenHeight->hat(z))
-                    obj->setMinZeilenHeight(z, minZeilenHeight->get(z));
-                if (maxZeilenHeight->hat(z))
-                    obj->setMaxZeilenHeight(z, maxZeilenHeight->get(z));
+                obj->addRow(zeilenNamen->get(z));
+                if (zeilenHeight->has(z))
+                    obj->setRowHeight(z, zeilenHeight->get(z));
+                if (minZeilenHeight->has(z))
+                    obj->setMinRowHeight(z, minZeilenHeight->get(z));
+                if (maxZeilenHeight->has(z))
+                    obj->setMaxRowHeight(z, maxZeilenHeight->get(z));
             }
-            if (members->z(s) && members->z(s)->hat(z))
+            if (members->z(s) && members->z(s)->has(z))
                 obj->setDrawableZ(s, z, members->z(s)->get(z));
-            if (styles->z(s) && styles->z(s)->hat(z))
+            if (styles->z(s) && styles->z(s)->has(z))
                 obj->setMsStyle(s, z, styles->z(s)->get(z));
             if (msaRam->z(s) && msaRam->z(s)->z(z))
                 obj->setABorderZ(
-                    s, z, (Border*)msaRam->z(s)->z(z)->dublizieren());
+                    s, z, (Border*)msaRam->z(s)->z(z)->duplicate());
             if (msaAf->z(s) && msaAf->z(s)->z(z))
                 obj->setAAlphaFieldZ(
-                    s, z, (AlphaField*)msaAf->z(s)->z(z)->dublizieren());
+                    s, z, (AlphaField*)msaAf->z(s)->z(z)->duplicate());
         }
     }
-    obj->setAuswahl(selected.x, selected.y);
+    obj->setSelection(selected.x, selected.y);
     return obj;
 }

Table.h

@@ -22,74 +22,74 @@ namespace Framework
         public:
             //! If this flag is set, the user can resize the columns
             //! with the mouse
-            static const __int64 SpaltenBreiteChangeable = 0x00001000;
+            static const __int64 ColumnWidthChangeable = 0x00001000;
             //! If this flag is set, the user can resize the rows
             //! with the mouse
-            static const __int64 ZeilenHeightChangeable = 0x00002000;
+            static const __int64 RowHeightChangeable = 0x00002000;
             //! If this flag is set, the user cannot make the column
             //! width smaller than a certain limit despite the
-            //! SpaltenBreiteChangeable flag
-            static const __int64 SpaltenBreiteMin = 0x00004000;
+            //! ColumnWidthChangeable flag
+            static const __int64 ColumnWidthMin = 0x00004000;
             //! If this flag is set, the user cannot make the column
             //! width larger than a certain limit despite the
-            //! SpaltenBreiteChangeable flag
-            static const __int64 SpaltenBreiteMax = 0x00008000;
+            //! ColumnWidthChangeable flag
+            static const __int64 ColumnWidthMax = 0x00008000;
             //! If this flag is set, the user cannot make the row
             //! height smaller than a certain limit despite the
-            //! ZeilenHeightChangeable flag
-            static const __int64 ZeilenHeightMin = 0x00010000;
+            //! RowHeightChangeable flag
+            static const __int64 RowHeightMin = 0x00010000;
             //! If this flag is set, the user cannot make the row
             //! height larger than a certain limit despite the
-            //! ZeilenHeightChangeable flag
-            static const __int64 ZeilenHeightMax = 0x00020000;
+            //! RowHeightChangeable flag
+            static const __int64 RowHeightMax = 0x00020000;
             //! If this flag is set, the user can reorder the columns
             //! by dragging and dropping them
-            static const __int64 SpaltenBeweglich = 0x00040000;
+            static const __int64 ColumnsMovable = 0x00040000;
             //! If this flag is set, the user can reorder the rows
             //! by dragging and dropping them
-            static const __int64 ZeilenBeweglich = 0x00800000;
+            static const __int64 RowsMovable = 0x00800000;
             //! If this flag is set, the field that the user can select
-            //! with the Erlaubt flag gets a different border
+            //! with the Allowed 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 AlphaField
-            static const __int64 AuswahlBuffer = 0x00100000;
+            //! with the Allowed flag gets a different AlphaField
+            static const __int64 SelectionBuffer = 0x00100000;
             //! If this flag is set, each field can have different
-            //! borders and AlphaFelds when selected
-            static const __int64 AuswahlMultistyled = 0x00200000;
+            //! borders and AlphaFields when selected
+            static const __int64 SelectionMultistyled = 0x00200000;
             //! If this flag is set, lines are drawn between the fields
             static const __int64 Raster = 0x00400000;
 
-            //! Combines the flags: SpaltenBreiteChangeable,
-            //! ZeilenHeightChangeable, SpaltenBeweglich,
-            //! ZeilenBeweglich
-            static const __int64 beweglich = SpaltenBreiteChangeable
-                                           | ZeilenHeightChangeable
-                                           | SpaltenBeweglich | ZeilenBeweglich;
-            //! Combines the flags: SpaltenBreiteMax,
-            //! SpaltenBreiteMin, ZeilenHeightMax,
-            //! ZeilenHeightMax
-            static const __int64 min_max = SpaltenBreiteMax | SpaltenBreiteMin
-                                         | ZeilenHeightMax | ZeilenHeightMax;
+            //! Combines the flags: ColumnWidthChangeable,
+            //! RowHeightChangeable, ColumnsMovable,
+            //! RowsMovable
+            static const __int64 beweglich = ColumnWidthChangeable
+                                           | RowHeightChangeable
+                                           | ColumnsMovable | RowsMovable;
+            //! Combines the flags: ColumnWidthMax,
+            //! ColumnWidthMin, RowHeightMax,
+            //! RowHeightMax
+            static const __int64 min_max = ColumnWidthMax | ColumnWidthMin
+                                         | RowHeightMax | RowHeightMax;
             //! Combines the flags: VScroll, HScroll
             static const __int64 scroll = VScroll | HScroll;
-            //! Combines the flags: Border, Erlaubt,
-            //! Sichtbar, SpaltenBeweglich,
-            //! AuswahlBuffer, SelectionBorder, Raster
+            //! Combines the flags: Border, Allowed,
+            //! Visible, ColumnsMovable,
+            //! SelectionBuffer, SelectionBorder, Raster
             static const __int64 normal
-                = Border | Erlaubt | Sichtbar | AuswahlBuffer | SelectionBorder
+                = Border | Allowed | Visible | SelectionBuffer | SelectionBorder
                 | Raster | MEIgnoreInside | MEIgnoreParentInside
-                | MEIgnoreSichtbar | MEIgnoreVerarbeitet;
+                | MEIgnoreVisible | MEIgnoreProcessed;
         };
 
     private:
         RCArray<RCArray<Drawable>>* members;
         RCArray<Text>* spaltenNamen;
         RCArray<Text>* zeilenNamen;
-        Array<int>* spaltenBreite;
+        Array<int>* columnWidth;
         Array<int>* zeilenHeight;
-        Array<int>* minSpaltenBreite;
-        Array<int>* maxSpaltenBreite;
+        Array<int>* minSpaltenWidth;
+        Array<int>* maxSpaltenWidth;
         Array<int>* minZeilenHeight;
         Array<int>* maxZeilenHeight;
         int spaltenAnzahl, zeilenAnzahl;
@@ -97,9 +97,9 @@ namespace Framework
         int klickZeile;
         double mSpalte, mZeile;
         int mx, my;
-        Punkt selected;
-        int rasterFarbe;
-        int rasterBreite;
+        Point selected;
+        int rasterColor;
+        int gridWidth;
         Border* aRam;
         AlphaField* aAf;
         RCArray<RCArray<Border>>* msaRam;
@@ -116,74 +116,74 @@ namespace Framework
         DLLEXPORT virtual ~ObjTable();
         //! Adds a column to the table
         //! \param name The name of the column
-        DLLEXPORT void addSpalte(const char* name);
+        DLLEXPORT void addColumn(const char* name);
         //! Adds a column to the table
         //! \param name The name of the column
-        DLLEXPORT void addSpalte(Text* name);
+        DLLEXPORT void addColumn(Text* name);
         //! Adds a column to the table at a specific position
         //! \param sNum The index of the new column
         //! \param name The name of the new column
-        DLLEXPORT void addSpalte(int sNum, const char* name);
+        DLLEXPORT void addColumn(int sNum, const char* name);
         //! Adds a column to the table at a specific position
         //! \param sNum The index of the new column
         //! \param name The name of the new column
-        DLLEXPORT void addSpalte(int sNum, Text* name);
+        DLLEXPORT void addColumn(int sNum, Text* name);
         //! Adds a row to the table
         //! \param name The name of the row
-        DLLEXPORT void addZeile(const char* name);
+        DLLEXPORT void addRow(const char* name);
         //! Adds a row to the table
         //! \param name The name of the row
-        DLLEXPORT void addZeile(Text* name);
+        DLLEXPORT void addRow(Text* name);
         //! Adds a row to the table at a specific position
         //! \param zNum The index of the new row
         //! \param name The name of the new row
-        DLLEXPORT void addZeile(int zNum, const char* name);
+        DLLEXPORT void addRow(int zNum, const char* name);
         //! Adds a row to the table at a specific position
         //! \param sNum The index of the new row
         //! \param name The name of the new row
-        DLLEXPORT void addZeile(int zNum, Text* name);
+        DLLEXPORT void addRow(int zNum, Text* name);
         //! Removes a column
         //! \param sNum The index of the column
-        DLLEXPORT void removeSpalte(int sNum);
+        DLLEXPORT void removeColumn(int sNum);
         //! Removes a column
         //! \param name The name of the column
-        DLLEXPORT void removeSpalte(const char* name);
+        DLLEXPORT void removeColumn(const char* name);
         //! Removes a column
         //! \param name The name of the column
-        DLLEXPORT void removeSpalte(Text* name);
+        DLLEXPORT void removeColumn(Text* name);
         //! Removes a row
         //! \param zNum The index of the row
-        DLLEXPORT void removeZeile(int zNum);
+        DLLEXPORT void removeRow(int zNum);
         //! Removes a row
         //! \param name The name of the row
-        DLLEXPORT void removeZeile(const char* name);
+        DLLEXPORT void removeRow(const char* name);
         //! Removes a row
         //! \param name The name of the row
-        DLLEXPORT void removeZeile(Text* name);
+        DLLEXPORT void removeRow(Text* name);
         //! Sets the index of a column
         //! \param name The name of the column
         //! \param pos The new index of the column
-        DLLEXPORT void setSpaltePosition(const char* name, int pos);
+        DLLEXPORT void setColumnPosition(const char* name, int pos);
         //! Sets the index of a column
         //! \param name The name of the column
         //! \param pos The new index of the column
-        DLLEXPORT void setSpaltePosition(Text* name, int pos);
+        DLLEXPORT void setColumnPosition(Text* name, int pos);
         //! Sets the index of a column
         //! \param sNum The old index of the column
         //! \param pos The new index of the column
-        DLLEXPORT void setSpaltePosition(int sNum, int pos);
+        DLLEXPORT void setColumnPosition(int sNum, int pos);
         //! Sets the index of a row
         //! \param name The name of the row
         //! \param pos The new index of the row
-        DLLEXPORT void setZeilePosition(const char* name, int pos);
+        DLLEXPORT void setRowPosition(const char* name, int pos);
         //! Sets the index of a row
         //! \param name The name of the row
         //! \param pos The new index of the row
-        DLLEXPORT void setZeilePosition(Text* name, int pos);
+        DLLEXPORT void setRowPosition(Text* name, int pos);
         //! Sets the index of a row
         //! \param zNum The old index of the row
         //! \param pos The new index of the row
-        DLLEXPORT void setZeilePosition(int zNum, int pos);
+        DLLEXPORT void setRowPosition(int zNum, int pos);
         //! Sets a drawing to be placed in a specific cell.
         //! If a drawing already exists in the cell, it will be overwritten.
         //! \param sNum The index of the column
@@ -207,248 +207,248 @@ namespace Framework
         //! Sets the column width
         //! \param sNum The index of the column
         //! \param br The width in pixels
-        DLLEXPORT void setSpaltenBreite(int sNum, int br);
+        DLLEXPORT void setColumnWidth(int sNum, int br);
         //! Sets the column width
         //! \param name The name of the column
         //! \param br The width in pixels
-        DLLEXPORT void setSpaltenBreite(const char* name, int br);
+        DLLEXPORT void setColumnWidth(const char* name, int br);
         //! Sets the column width
         //! \param name The name of the column
         //! \param br The width in pixels
-        DLLEXPORT void setSpaltenBreite(Text* name, int br);
+        DLLEXPORT void setColumnWidth(Text* name, int br);
         //! Sets the row height
         //! \param zNum The index of the row
         //! \param hi The height in pixels
-        DLLEXPORT void setZeilenHeight(int zNum, int hi);
+        DLLEXPORT void setRowHeight(int zNum, int hi);
         //! Sets the row height
         //! \param name The name of the row
         //! \param hi The height in pixels
-        DLLEXPORT void setZeilenHeight(const char* name, int hi);
+        DLLEXPORT void setRowHeight(const char* name, int hi);
         //! Sets the row height
         //! \param name The name of the row
         //! \param hi The height in pixels
-        DLLEXPORT void setZeilenHeight(Text* name, int hi);
+        DLLEXPORT void setRowHeight(Text* name, int hi);
         //! Sets the minimum column width (requires flags:
-        //! SpaltenBreiteChangeable, SpaltenBreiteMin) \param sNum The index of
+        //! ColumnWidthChangeable, ColumnWidthMin) \param sNum The index of
         //! the column \param minBr The minimum width in pixels
-        DLLEXPORT void setMinSpaltenBreite(int sNum, int minBr);
+        DLLEXPORT void setMinColumnWidth(int sNum, int minBr);
         //! Sets the minimum column width (requires flags:
-        //! SpaltenBreiteChangeable, SpaltenBreiteMin) \param name The name of
+        //! ColumnWidthChangeable, ColumnWidthMin) \param name The name of
         //! the column \param minBr The minimum width in pixels
-        DLLEXPORT void setMinSpaltenBreite(const char* name, int minBr);
+        DLLEXPORT void setMinColumnWidth(const char* name, int minBr);
         //! Sets the minimum column width (requires flags:
-        //! SpaltenBreiteChangeable, SpaltenBreiteMin) \param name The name of
+        //! ColumnWidthChangeable, ColumnWidthMin) \param name The name of
         //! the column \param minBr The minimum width in pixels
-        DLLEXPORT void setMinSpaltenBreite(Text* name, int minBr);
+        DLLEXPORT void setMinColumnWidth(Text* name, int minBr);
         //! Sets the maximum column width (requires flags:
-        //! SpaltenBreiteChangeable, SpaltenBreiteMax) \param sNum The index of
+        //! ColumnWidthChangeable, ColumnWidthMax) \param sNum The index of
         //! the column \param maxBr The maximum width in pixels
-        DLLEXPORT void setMaxSpaltenBreite(int sNum, int maxBr);
+        DLLEXPORT void setMaxColumnWidth(int sNum, int maxBr);
         //! Sets the maximum column width (requires flags:
-        //! SpaltenBreiteChangeable, SpaltenBreiteMax) \param name The name of
+        //! ColumnWidthChangeable, ColumnWidthMax) \param name The name of
         //! the column \param maxBr The maximum width in pixels
-        DLLEXPORT void setMaxSpaltenBreite(const char* name, int maxBr);
+        DLLEXPORT void setMaxColumnWidth(const char* name, int maxBr);
         //! Sets the maximum column width (requires flags:
-        //! SpaltenBreiteChangeable, SpaltenBreiteMax) \param name The name of
+        //! ColumnWidthChangeable, ColumnWidthMax) \param name The name of
         //! the column \param maxBr The maximum width in pixels
-        DLLEXPORT void setMaxSpaltenBreite(Text* name, int maxBr);
+        DLLEXPORT void setMaxColumnWidth(Text* name, int maxBr);
         //! Sets the minimum row height (requires flags:
-        //! ZeilenHeightChangeable, ZeilenHeightMin) \param zNum The index of
+        //! RowHeightChangeable, RowHeightMin) \param zNum The index of
         //! the row \param minHi The minimum height in pixels
-        DLLEXPORT void setMinZeilenHeight(int zNum, int minHi);
+        DLLEXPORT void setMinRowHeight(int zNum, int minHi);
         //! Sets the minimum row height (requires flags:
-        //! ZeilenHeightChangeable, ZeilenHeightMin) \param name The name of
+        //! RowHeightChangeable, RowHeightMin) \param name The name of
         //! the row \param minHi The minimum height in pixels
-        DLLEXPORT void setMinZeilenHeight(const char* name, int minHi);
+        DLLEXPORT void setMinRowHeight(const char* name, int minHi);
         //! Sets the minimum row height (requires flags:
-        //! ZeilenHeightChangeable, ZeilenHeightMin) \param name The name of
+        //! RowHeightChangeable, RowHeightMin) \param name The name of
         //! the row \param minHi The minimum height in pixels
-        DLLEXPORT void setMinZeilenHeight(Text* name, int minHi);
+        DLLEXPORT void setMinRowHeight(Text* name, int minHi);
         //! Sets the maximum row height (requires flags:
-        //! ZeilenHeightChangeable, ZeilenHeightMax) \param zNum The index of
+        //! RowHeightChangeable, RowHeightMax) \param zNum The index of
         //! the row \param maxHi The maximum height in pixels
-        DLLEXPORT void setMaxZeilenHeight(int zNum, int maxHi);
+        DLLEXPORT void setMaxRowHeight(int zNum, int maxHi);
         //! Sets the maximum row height (requires flags:
-        //! ZeilenHeightChangeable, ZeilenHeightMax) \param name The name of
+        //! RowHeightChangeable, RowHeightMax) \param name The name of
         //! the row \param maxHi The maximum height in pixels
-        DLLEXPORT void setMaxZeilenHeight(const char* name, int maxHi);
+        DLLEXPORT void setMaxRowHeight(const char* name, int maxHi);
         //! Sets the maximum row height (requires flags:
-        //! ZeilenHeightChangeable, ZeilenHeightMax) \param name The name of
+        //! RowHeightChangeable, RowHeightMax) \param name The name of
         //! the row \param maxHi The maximum height in pixels
-        DLLEXPORT void setMaxZeilenHeight(Text* name, int maxHi);
-        //! Sets which cell is selected (requires flag: Erlaubt)
+        DLLEXPORT void setMaxRowHeight(Text* name, int maxHi);
+        //! Sets which cell is selected (requires flag: Allowed)
         //! \param sNum The index of the column
         //! \param zNum The index of the row
-        DLLEXPORT void setAuswahl(int sNum, int zNum);
-        //! Sets which cell is selected (requires flag: Erlaubt)
+        DLLEXPORT void setSelection(int sNum, int zNum);
+        //! Sets which cell is selected (requires flag: Allowed)
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
-        DLLEXPORT void setAuswahl(
+        DLLEXPORT void setSelection(
             const char* spaltenName, const char* zeilenName);
-        //! Sets which cell is selected (requires flag: Erlaubt)
+        //! Sets which cell is selected (requires flag: Allowed)
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
-        DLLEXPORT void setAuswahl(Text* spaltenName, Text* zeilenName);
+        DLLEXPORT void setSelection(Text* spaltenName, Text* zeilenName);
         //! Sets the color of the grid displayed between cells
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setRasterFarbe(int f);
+        DLLEXPORT void setGridColor(int f);
         //! Sets the width of the grid displayed between cells
         //! \param br The width in pixels
-        DLLEXPORT void setRasterBreite(int br);
+        DLLEXPORT void setGridWidth(int br);
         //! Sets a pointer to the border drawn around the selected cell
         //! \param ram The border
         DLLEXPORT void setABorderZ(Border* ram);
         //! Sets the color of the border drawn around the selected cell
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setARFarbe(int f);
+        DLLEXPORT void setARColor(int f);
         //! Sets the width of the border drawn around the selected cell
         //! \param br The width in pixels
-        DLLEXPORT void setARBreite(int br);
+        DLLEXPORT void setARWidth(int br);
         //! 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);
+        DLLEXPORT void setAAfColor(int f);
         //! 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
+        //! Sets a pointer to a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param ram The border
         DLLEXPORT void setABorderZ(int sNum, int zNum, Border* ram);
-        //! Sets a pointer to a border used with the AuswahlMultistyled flag
+        //! Sets a pointer to a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row
         //! \param ram The border
         DLLEXPORT void setABorderZ(
             const char* spaltenName, const char* zeilenName, Border* ram);
-        //! Sets a pointer to a border used with the AuswahlMultistyled flag
+        //! Sets a pointer to a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row
         //! \param ram The border
         DLLEXPORT void setABorderZ(
             Text* spaltenName, Text* zeilenName, Border* ram);
-        //! Sets the color of a border used with the AuswahlMultistyled flag
+        //! Sets the color of a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param f The color in A8R8G8B8
         //! format
-        DLLEXPORT void setARFarbe(int sNum, int zNum, int f);
-        //! Sets the color of a border used with the AuswahlMultistyled flag
+        DLLEXPORT void setARColor(int sNum, int zNum, int f);
+        //! Sets the color of a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setARFarbe(
+        DLLEXPORT void setARColor(
             const char* spaltenName, const char* zeilenName, int f);
-        //! Sets the color of a border used with the AuswahlMultistyled flag
+        //! Sets the color of a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setARFarbe(Text* spaltenName, Text* zeilenName, int f);
-        //! Sets the width of a border used with the AuswahlMultistyled flag
+        DLLEXPORT void setARColor(Text* spaltenName, Text* zeilenName, int f);
+        //! Sets the width of a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param br The width in pixels
-        DLLEXPORT void setARBreite(int sNum, int zNum, int br);
-        //! Sets the width of a border used with the AuswahlMultistyled flag
+        DLLEXPORT void setARWidth(int sNum, int zNum, int br);
+        //! Sets the width of a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row
         //! \param br The width in pixels
-        DLLEXPORT void setARBreite(
+        DLLEXPORT void setARWidth(
             const char* spaltenName, const char* zeilenName, int br);
-        //! Sets the width of a border used with the AuswahlMultistyled flag
+        //! Sets the width of a border used with the SelectionMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row
         //! \param br The width in pixels
-        DLLEXPORT void setARBreite(Text* spaltenName, Text* zeilenName, int br);
-        //! Sets the color gradient used with the AuswahlMultistyled flag
+        DLLEXPORT void setARWidth(Text* spaltenName, Text* zeilenName, int br);
+        //! Sets the color gradient used with the SelectionMultistyled 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 setAAlphaFieldZ(int sNum, int zNum, AlphaField* af);
-        //! Sets the color gradient used with the AuswahlMultistyled flag
+        //! Sets the color gradient used with the SelectionMultistyled 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 setAAlphaFieldZ(
             const char* spaltenName, const char* zeilenName, AlphaField* af);
-        //! Sets the color gradient used with the AuswahlMultistyled flag
+        //! Sets the color gradient used with the SelectionMultistyled 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 setAAlphaFieldZ(
             Text* spaltenName, Text* zeilenName, AlphaField* af);
         //! Sets the color of the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param sNum The index of the column \param zNum The index of the
         //! row \param f The color in A8R8G8B8 format
-        DLLEXPORT void setAAfFarbe(int sNum, int zNum, int f);
+        DLLEXPORT void setAAfColor(int sNum, int zNum, int f);
         //! Sets the color of the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setAAfFarbe(
+        DLLEXPORT void setAAfColor(
             const char* spaltenName, const char* zeilenName, int f);
         //! Sets the color of the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setAAfFarbe(Text* spaltenName, Text* zeilenName, int f);
+        DLLEXPORT void setAAfColor(Text* spaltenName, Text* zeilenName, int f);
         //! Sets the strength of the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param sNum The index of the column \param zNum The index of the
         //! row \param st The strength
         DLLEXPORT void setAAfStrength(int sNum, int zNum, int st);
         //! Sets the strength of the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         //! \param st The strength
         DLLEXPORT void setAAfStrength(
             const char* spaltenName, const char* zeilenName, int st);
         //! Sets the strength of the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         //! \param st The strength
         DLLEXPORT void setAAfStrength(
             Text* spaltenName, Text* zeilenName, int st);
-        //! Adds styles used with the AuswahlMultistyled flag when selecting
+        //! Adds styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param style The style to add
         DLLEXPORT void addMsStyle(int sNum, int zNum, __int64 style);
-        //! Adds styles used with the AuswahlMultistyled flag when selecting
+        //! Adds styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style to add
         DLLEXPORT void addMsStyle(
             const char* spaltenName, const char* zeilenName, __int64 style);
-        //! Adds styles used with the AuswahlMultistyled flag when selecting
+        //! Adds styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style to add
         DLLEXPORT void addMsStyle(
             Text* spaltenName, Text* zeilenName, __int64 style);
-        //! Sets the styles used with the AuswahlMultistyled flag when selecting
+        //! Sets the styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param style The style to use
         DLLEXPORT void setMsStyle(int sNum, int zNum, __int64 style);
-        //! Sets the styles used with the AuswahlMultistyled flag when selecting
+        //! Sets the styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style to use
         DLLEXPORT void setMsStyle(
             const char* spaltenName, const char* zeilenName, __int64 style);
-        //! Sets the styles used with the AuswahlMultistyled flag when selecting
+        //! Sets the styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style to use
         DLLEXPORT void setMsStyle(
             Text* spaltenName, Text* zeilenName, __int64 style);
-        //! Sets the styles used with the AuswahlMultistyled flag when selecting
+        //! Sets the styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param style The style to use
         //!  add_remove: 1 if the given styles should be added.
         //!  0 if they should be removed
         DLLEXPORT void setMsStyle(
             int sNum, int zNum, __int64 style, bool add_remove);
-        //! Sets the styles used with the AuswahlMultistyled flag when selecting
+        //! Sets the styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style to use
         //!  add_remove: 1 if the given styles should be added.
@@ -457,7 +457,7 @@ namespace Framework
             const char* zeilenName,
             __int64 style,
             bool add_remove);
-        //! Sets the styles used with the AuswahlMultistyled flag when selecting
+        //! Sets the styles used with the SelectionMultistyled flag when selecting
         //! a specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style to use
         //!  add_remove: 1 if the given styles should be added.
@@ -466,17 +466,17 @@ namespace Framework
             Text* zeilenName,
             __int64 style,
             bool add_remove);
-        //! Removes styles from the styles used with the AuswahlMultistyled flag
+        //! Removes styles from the styles used with the SelectionMultistyled flag
         //! when selecting a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param style The style to remove
         DLLEXPORT void removeMsStyle(int sNum, int zNum, __int64 style);
-        //! Removes styles from the styles used with the AuswahlMultistyled flag
+        //! Removes styles from the styles used with the SelectionMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row \param style The style
         //! to remove
         DLLEXPORT void removeMsStyle(
             const char* spaltenName, const char* zeilenName, __int64 style);
-        //! Removes styles from the styles used with the AuswahlMultistyled flag
+        //! Removes styles from the styles used with the SelectionMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row \param style The style
         //! to remove
@@ -494,37 +494,37 @@ namespace Framework
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
         //! Returns the number of columns
-        DLLEXPORT int getSpaltenAnzahl() const;
+        DLLEXPORT int getColumnCount() const;
         //! Returns the number of rows
-        DLLEXPORT int getZeilenAnzahl() const;
+        DLLEXPORT int getRowCount() const;
         //! Returns the index of a column
         //! \param name The name of the column
-        DLLEXPORT int getSpaltenNummer(const char* name) const;
+        DLLEXPORT int getColumnNumber(const char* name) const;
         //! Returns the index of a column
         //! \param name The name of the column
-        DLLEXPORT int getSpaltenNummer(Text* name) const;
+        DLLEXPORT int getColumnNumber(Text* name) const;
         //! Returns the name of a column
         //! \param num The index of the column
-        DLLEXPORT Text* getSpaltenName(int num) const;
+        DLLEXPORT Text* getColumnName(int num) const;
         //! Returns the name of a column without increased reference counter
         //! \param num The index of the column
-        DLLEXPORT Text* zSpaltenName(int num) const;
+        DLLEXPORT Text* zColumnName(int num) const;
         //! Returns the index of a row
         //! \param name The name of the row
-        DLLEXPORT int getZeilenNummer(const char* name) const;
+        DLLEXPORT int getRowNumber(const char* name) const;
         //! Returns the index of a row
         //! \param name The name of the row
-        DLLEXPORT int getZeilenNummer(Text* name) const;
+        DLLEXPORT int getRowNumber(Text* name) const;
         //! Returns the name of a row
         //! \param num The index of the row
-        DLLEXPORT Text* getZeilenName(int num) const;
+        DLLEXPORT Text* getRowName(int num) const;
         //! Returns the name of a row without increased reference counter
         //! \param num The index of the row
-        DLLEXPORT Text* zZeilenName(int num) const;
+        DLLEXPORT Text* zRowName(int num) const;
         //! Searches for a drawing in the table and returns the column index
         //! as x and the row index as y. (-1, -1) if the object was not found
         //! \param zObj The drawing (without increased reference counter)
-        DLLEXPORT Punkt getDrawablePosition(Drawable* zObj) const;
+        DLLEXPORT Point getDrawablePosition(Drawable* zObj) const;
         //! Returns the drawing in a specific cell of the table
         //! (without increased reference counter) \param sNum The index of
         //! the column \param zNum The index of the row
@@ -554,89 +554,89 @@ namespace Framework
             Text* spaltenName, Text* zeilenName) const;
         //! Returns the width of a column in pixels
         //! \param num The index of the column
-        DLLEXPORT int getSpaltenBreite(int num) const;
+        DLLEXPORT int getColumnWidth(int num) const;
         //! Returns the width of a column in pixels
         //! \param name The name of the column
-        DLLEXPORT int getSpaltenBreite(const char* name) const;
+        DLLEXPORT int getColumnWidth(const char* name) const;
         //! Returns the width of a column in pixels
         //! \param name The name of the column
-        DLLEXPORT int getSpaltenBreite(Text* name) const;
+        DLLEXPORT int getColumnWidth(Text* name) const;
         //! Returns the height of a row in pixels
         //! \param num The index of the row
-        DLLEXPORT int getZeilenHeight(int num) const;
+        DLLEXPORT int getRowHeight(int num) const;
         //! Returns the height of a row in pixels
         //! \param name The name of the row
-        DLLEXPORT int getZeilenHeight(const char* name) const;
+        DLLEXPORT int getRowHeight(const char* name) const;
         //! Returns the height of a row in pixels
         //! \param name The name of the row
-        DLLEXPORT int getZeilenHeight(Text* name) const;
+        DLLEXPORT int getRowHeight(Text* name) const;
         //! Returns the minimum column width in pixels
         //! \param num The index of the column
-        DLLEXPORT int getMinSpaltenBreite(int num) const;
+        DLLEXPORT int getMinColumnWidth(int num) const;
         //! Returns the minimum column width in pixels
         //! \param name The name of the column
-        DLLEXPORT int getMinSpaltenBreite(const char* name) const;
+        DLLEXPORT int getMinColumnWidth(const char* name) const;
         //! Returns the minimum column width in pixels
         //! \param name The name of the column
-        DLLEXPORT int getMinSpaltenBreite(Text* name) const;
+        DLLEXPORT int getMinColumnWidth(Text* name) const;
         //! Returns the maximum column width in pixels
         //! \param num The index of the column
-        DLLEXPORT int getMaxSpaltenBreite(int num) const;
+        DLLEXPORT int getMaxColumnWidth(int num) const;
         //! Returns the maximum column width in pixels
         //! \param name The name of the column
-        DLLEXPORT int getMaxSpaltenBreite(const char* name) const;
+        DLLEXPORT int getMaxColumnWidth(const char* name) const;
         //! Returns the maximum column width in pixels
         //! \param name The name of the column
-        DLLEXPORT int getMaxSpaltenBreite(Text* name) const;
+        DLLEXPORT int getMaxColumnWidth(Text* name) const;
         //! Returns the minimum row height in pixels
         //! \param num The index of the row
-        DLLEXPORT int getMinZeilenHeight(int num) const;
+        DLLEXPORT int getMinRowHeight(int num) const;
         //! Returns the minimum row height in pixels
         //! \param name The name of the row
-        DLLEXPORT int getMinZeilenHeight(const char* name) const;
+        DLLEXPORT int getMinRowHeight(const char* name) const;
         //! Returns the minimum row height in pixels
         //! \param name The name of the row
-        DLLEXPORT int getMinZeilenHeight(Text* name) const;
+        DLLEXPORT int getMinRowHeight(Text* name) const;
         //! Returns the maximum row height in pixels
         //! \param num The index of the row
-        DLLEXPORT int getMaxZeilenHeight(int num) const;
+        DLLEXPORT int getMaxRowHeight(int num) const;
         //! Returns the maximum row height in pixels
         //! \param name The name of the row
-        DLLEXPORT int getMaxZeilenHeight(const char* name) const;
+        DLLEXPORT int getMaxRowHeight(const char* name) const;
         //! Returns the maximum row height in pixels
         //! \param name The name of the row
-        DLLEXPORT int getMaxZeilenHeight(Text* name) const;
+        DLLEXPORT int getMaxRowHeight(Text* name) const;
         //! Returns the index of the column the mouse points to
         //! \param mx The x coordinate of the mouse position relative to the
         //! left edge of the table in pixels
-        DLLEXPORT double getMausSpalte(int mx) const;
+        DLLEXPORT double getMouseColumn(int mx) const;
         //! Returns the name of the column the mouse points to
         //! \param mx The x coordinate of the mouse position relative to the
         //! left edge of the table in pixels
-        DLLEXPORT Text* getMausSpaltenName(int mx) const;
+        DLLEXPORT Text* getMouseColumnnName(int mx) const;
         //! Returns the name of the column the mouse points to without increased
         //! reference counter \param mx The x coordinate of the mouse position
         //! relative to the left edge of the table in pixels
-        DLLEXPORT Text* zMausSpaltenName(int mx) const;
+        DLLEXPORT Text* zMouseColumnName(int mx) const;
         //! Returns the index of the row the mouse points to
         //! \param my The Y coordinate of the mouse position relative to the
         //! top edge of the table in pixels
-        DLLEXPORT double getMausZeile(int my) const;
+        DLLEXPORT double getMouseRow(int my) const;
         //! Returns the name of the row the mouse points to
         //! \param my The Y coordinate of the mouse position relative to the
         //! top edge of the table in pixels
-        DLLEXPORT Text* getMausZeilenName(int my) const;
+        DLLEXPORT Text* getMouseRownName(int my) const;
         //! Returns the name of the row the mouse points to without increased
         //! reference counter \param my The Y coordinate of the mouse position
         //! relative to the top edge of the table in pixels
-        DLLEXPORT Text* zMausZeilenName(int my) const;
+        DLLEXPORT Text* zMouseRowName(int my) const;
         //! Returns the column index as x and the row index as y of the
         //! selected field
-        DLLEXPORT const Punkt& getAuswahlPosition() const;
+        DLLEXPORT const Point& getSelahlPosition() const;
         //! Returns the color of the grid in A8R8G8B8 format
-        DLLEXPORT int getRasterFarbe() const;
+        DLLEXPORT int getGridColor() const;
         //! Returns the width of the grid in pixels
-        DLLEXPORT int getRasterBreite() const;
+        DLLEXPORT int getGridWidth() const;
         //! Returns a pointer to the border used for the selected field
         DLLEXPORT Border* getABorder() const;
         //! Returns a pointer to the border without increased reference counter
@@ -647,107 +647,107 @@ namespace Framework
         //! Returns a pointer to the color gradient without increased reference
         //! counter used for the selected field
         DLLEXPORT AlphaField* zAAlphaField() const;
-        //! Returns a pointer to the border used with the AuswahlMultistyled
+        //! Returns a pointer to the border used with the SelectionMultistyled
         //! flag when selecting a specific cell \param sNum The index of the
         //! column \param zNum The index of the row
         DLLEXPORT Border* getABorder(int sNum, int zNum) const;
         //! Returns a pointer to the border without increased reference counter
-        //! used with the AuswahlMultistyled flag when selecting a specific cell
+        //! used with the SelectionMultistyled flag when selecting a specific cell
         //! \param sNum The index of the column \param zNum The index of the row
         DLLEXPORT Border* zABorder(int sNum, int zNum) const;
         //! Returns a pointer to the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param sNum The index of the column \param zNum The index of the row
         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
+        //! counter used with the SelectionMultistyled flag when selecting a
         //! specific cell \param sNum The index of the column
         //! \param zNum The index of the row
         DLLEXPORT AlphaField* zAAlphaField(int sNum, int zNum) const;
-        //! Returns a pointer to the border used with the AuswahlMultistyled
+        //! Returns a pointer to the border used with the SelectionMultistyled
         //! flag when selecting a specific cell \param spaltenName The name of
         //! the column \param zeilenName The name of the row
         DLLEXPORT Border* getABorder(
             const char* spaltenName, const char* zeilenName) const;
         //! Returns a pointer to the border without increased reference counter
-        //! used with the AuswahlMultistyled flag when selecting a specific cell
+        //! used with the SelectionMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         DLLEXPORT Border* zABorder(
             const char* spaltenName, const char* zeilenName) const;
         //! Returns a pointer to the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         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
+        //! counter used with the SelectionMultistyled flag when selecting a
         //! specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         DLLEXPORT AlphaField* zAAlphaField(
             const char* spaltenName, const char* zeilenName) const;
-        //! Returns a pointer to the border used with the AuswahlMultistyled
+        //! Returns a pointer to the border used with the SelectionMultistyled
         //! flag when selecting a specific cell \param spaltenName The name of
         //! the column \param zeilenName The name of the row
         DLLEXPORT Border* getABorder(Text* spaltenName, Text* zeilenName) const;
         //! Returns a pointer to the border without increased reference counter
-        //! used with the AuswahlMultistyled flag when selecting a specific cell
+        //! used with the SelectionMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         DLLEXPORT Border* zABorder(Text* spaltenName, Text* zeilenName) const;
         //! Returns a pointer to the color gradient used with the
-        //! AuswahlMultistyled flag when selecting a specific cell
+        //! SelectionMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         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
+        //! counter used with the SelectionMultistyled flag when selecting a
         //! specific cell \param spaltenName The name of the column
         //! \param zeilenName The name of the row
         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
+        //! SelectionMultistyled flag \param sNum The index of the column
         //! \param zNum The index of the row
         //! \param style The style to check
-        DLLEXPORT inline bool hatMsStyle(
+        DLLEXPORT inline bool hasMsStyle(
             int sNum, int zNum, __int64 style) const;
         //! Checks whether a specific style is not set for a specific cell with
-        //! the AuswahlMultistyled flag \param sNum The index of the column
+        //! the SelectionMultistyled flag \param sNum The index of the column
         //! \param zNum The index of the row \param style The style to check
-        DLLEXPORT inline bool hatMsStyleNicht(
+        DLLEXPORT inline bool hasMsStyleNot(
             int sNum, int zNum, __int64 style) const;
         //! Checks whether a specific style is set for a specific cell with the
-        //! AuswahlMultistyled flag \param spaltenName The name of the column
+        //! SelectionMultistyled flag \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style
         //! to check
-        DLLEXPORT inline bool hatMsStyle(const char* spaltenName,
+        DLLEXPORT inline bool hasMsStyle(const char* spaltenName,
             const char* zeilenName,
             __int64 style) const;
         //! Checks whether a specific style is not set for a specific cell with
-        //! the AuswahlMultistyled flag \param spaltenName The name of the column
+        //! the SelectionMultistyled flag \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style
         //! to check
-        DLLEXPORT inline bool hatMsStyleNicht(const char* spaltenName,
+        DLLEXPORT inline bool hasMsStyleNot(const char* spaltenName,
             const char* zeilenName,
             __int64 style) const;
         //! Checks whether a specific style is set for a specific cell with the
-        //! AuswahlMultistyled flag \param spaltenName The name of the column
+        //! SelectionMultistyled flag \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style
         //! to check
-        DLLEXPORT inline bool hatMsStyle(
+        DLLEXPORT inline bool hasMsStyle(
             Text* spaltenName, Text* zeilenName, __int64 style) const;
         //! Checks whether a specific style is not set for a specific cell with
-        //! the AuswahlMultistyled flag \param spaltenName The name of the column
+        //! the SelectionMultistyled flag \param spaltenName The name of the column
         //! \param zeilenName The name of the row \param style The style
         //! to check
-        DLLEXPORT inline bool hatMsStyleNicht(
+        DLLEXPORT inline bool hasMsStyleNot(
             Text* spaltenName, Text* zeilenName, __int64 style) const;
         //! Creates a copy of the table that can be modified without
         //! affecting the original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 } // namespace Framework
 #endif

Text.cpp

@@ -500,13 +500,13 @@ void Framework::Text::regexReplace(const char* regex,
     matcher->release();
 }
 
-void Text::ersetzen(
+void Text::replace(
     int p1, int p2, const char* t) // replaces text from p1 to p2
 {
-    ersetzen(p1, p2, t, textLength(t)); // replace text
+    replace(p1, p2, t, textLength(t)); // replace text
 }
 
-void Framework::Text::ersetzen(int p1, int p2, const char* t, int len)
+void Framework::Text::replace(int p1, int p2, const char* t, int len)
 {
     if (p1 > p2)
     {
@@ -521,16 +521,16 @@ void Framework::Text::ersetzen(int p1, int p2, const char* t, int len)
     }
 }
 
-void Text::ersetzen(int p1, int p2, const Text& t)
+void Text::replace(int p1, int p2, const Text& t)
 {
-    ersetzen(p1, p2, t, t.getLength()); // replace text
+    replace(p1, p2, t, t.getLength()); // replace text
 }
 
-void Text::ersetzen(char c1, char c2) // replaces every c1 with c2
+void Text::replace(char c1, char c2) // replaces every c1 with c2
 {
     if (c1 == '\0' || c2 == '\0') // check for invalid argument
         return;
-    if (!hat(c1)) // check if c1 exists
+    if (!has(c1)) // check if c1 exists
         return;
     int suchGCount = 0;
     if (suchGBeg && suchGEnd)
@@ -553,25 +553,25 @@ void Text::ersetzen(char c1, char c2) // replaces every c1 with c2
     }
 }
 
-void Text::ersetzen(const char* t1, const char* t2) // replaces every t1 with t2
+void Text::replace(const char* t1, const char* t2) // replaces every t1 with t2
 {
-    ersetzen(t1, textLength(t1), t2, textLength(t2)); // replace text
+    replace(t1, textLength(t1), t2, textLength(t2)); // replace text
 }
 
-void Framework::Text::ersetzen(
+void Framework::Text::replace(
     const char* t1, int len1, const char* t2, int len2)
 {
     if (len1 > length || len1 <= 0) // check for invalid argument
         return;
-    if (!hat(t1, len1)) // check if t1 exists
+    if (!has(t1, len1)) // check if t1 exists
         return;
-    int anz = anzahlVon(t1, len1); // count of t1 in text
+    int anz = countOf(t1, len1); // count of t1 in text
     int* begin = new int[anz];
     int* end = new int[anz];
     int searchStart = 0;
     for (int i = 0; i < anz; ++i) // save positions of t1
     {
-        begin[i] = positionVon(searchStart, t1, len1);
+        begin[i] = positionOf(searchStart, t1, len1);
         end[i] = begin[i] + len1;
         searchStart = end[i];
     }
@@ -608,70 +608,70 @@ void Framework::Text::ersetzen(
     delete[] end;
 }
 
-void Text::ersetzen(const Text& t1, const char* t2)
+void Text::replace(const Text& t1, const char* t2)
 {
-    ersetzen(t1, t1.getLength(), t2, textLength(t2)); // replace text
+    replace(t1, t1.getLength(), t2, textLength(t2)); // replace text
 }
 
-void Text::ersetzen(const char* t1, const Text& t2)
+void Text::replace(const char* t1, const Text& t2)
 {
-    ersetzen(t1, textLength(t1), t2, t2.getLength()); // replace text
+    replace(t1, textLength(t1), t2, t2.getLength()); // replace text
 }
 
-void Text::ersetzen(const Text& t1, const Text& t2)
+void Text::replace(const Text& t1, const Text& t2)
 {
-    ersetzen(t1, t1.getLength(), t2, t2.getLength()); // replace text
+    replace(t1, t1.getLength(), t2, t2.getLength()); // replace text
 }
 
-void Text::ersetzen(int index, char c1, char c2) // replaces the i-th c1 with c2
+void Text::replace(int index, char c1, char c2) // replaces the i-th c1 with c2
 {
     if (c1 == '\0' || c2 == '\0'
         || index < 0) // check for invalid argument
         return;
-    if (!hat(c1)) // check if c1 exists
+    if (!has(c1)) // check if c1 exists
         return;
-    int anz = anzahlVon(c1);
+    int anz = countOf(c1);
     if (index >= anz) // check if an i-th c1 exists
         return;
-    txt[positionVon(c1, index)] = c2;
+    txt[positionOf(c1, index)] = c2;
 }
 
-void Text::ersetzen(int index,
+void Text::replace(int index,
     const char* t1,
     const char* t2) // replaces the i-th t1 with t2
 {
-    ersetzen(index, t1, textLength(t1), t2, textLength(t2)); // replace text
+    replace(index, t1, textLength(t1), t2, textLength(t2)); // replace text
 }
 
-void Framework::Text::ersetzen(
+void Framework::Text::replace(
     int index, const char* t1, int len1, const char* t2, int len2)
 {
     if (len1 >= length || len1 <= 0
         || index < 0) // check for invalid argument
         return;
-    if (!hat(t1)) // check if t1 exists
+    if (!has(t1)) // check if t1 exists
         return;
-    int anz = anzahlVon(t1, len1); // count of t1 in text
+    int anz = countOf(t1, len1); // count of t1 in text
     if (index >= anz)              // check if an i-th t1 exists
         return;
-    int begin = positionVon(index, len1, t1);
+    int begin = positionOf(index, len1, t1);
     int end = begin + len1;
-    ersetzen(begin, end, t2, len2); // replace
+    replace(begin, end, t2, len2); // replace
 }
 
-void Text::ersetzen(int i, const Text& t1, const char* t2)
+void Text::replace(int i, const Text& t1, const char* t2)
 {
-    ersetzen(i, t1, t1.getLength(), t2, textLength(t2)); // replace
+    replace(i, t1, t1.getLength(), t2, textLength(t2)); // replace
 }
 
-void Text::ersetzen(int i, const char* t1, const Text& t2)
+void Text::replace(int i, const char* t1, const Text& t2)
 {
-    ersetzen(i, t1, textLength(t1), t2, t2.getLength()); // replace
+    replace(i, t1, textLength(t1), t2, t2.getLength()); // replace
 }
 
-void Text::ersetzen(int i, const Text& t1, const Text& t2)
+void Text::replace(int i, const Text& t1, const Text& t2)
 {
-    ersetzen(i, t1, t1.getLength(), t2,
+    replace(i, t1, t1.getLength(), t2,
         t2.getLength()); // replace
 }
 
@@ -720,9 +720,9 @@ void Text::remove(int p1, int p2) // deletes from p1 to p2 (p2 is kept)
 
 void Text::remove(char c) // deletes every c
 {
-    if (!hat(c)) // check if c exists
+    if (!has(c)) // check if c exists
         return;
-    int anz = anzahlVon(c);                          // count of c
+    int anz = countOf(c);                          // count of c
     char* res = new char[(__int64)length - anz + 1]; // create new text
     int anz2 = 0;
     int suchGCount = 0;
@@ -756,12 +756,12 @@ void Framework::Text::remove(const char* t, int len)
 {
     if (len <= 0 || len > length) // check for invalid argument
         return;
-    if (!hat(t, len)) // check if text contains t
+    if (!has(t, len)) // check if text contains t
         return;
-    int anz = anzahlVon(t, len); // count of t
+    int anz = countOf(t, len); // count of t
     int* begin = new int[anz];
     for (int i = 0; i < anz; ++i) // find start of all t's
-        begin[i] = positionVon(i, len, t);
+        begin[i] = positionOf(i, len, t);
     int resl = length - (anz * len);         // length of result
     char* res = new char[(__int64)resl + 1]; // create new text
     int del = 0;
@@ -787,12 +787,12 @@ void Text::remove(const Text& t)
 
 void Text::remove(int index, char c)
 {
-    if (index < 0 || !hat(c)) // check for invalid argument
+    if (index < 0 || !has(c)) // check for invalid argument
         return;
-    int anz = anzahlVon(c); // count of c's
+    int anz = countOf(c); // count of c's
     if (index >= anz)       // check if an i-th c exists
         return;
-    int pos = positionVon(c, index); // position of the i-th c
+    int pos = positionOf(c, index); // position of the i-th c
     if (pos < 0) return;
     if (!length) return;
     char* res = new char[length];               // create new text
@@ -811,13 +811,13 @@ void Text::remove(int index, const char* t) // deletes the i-th t
 
 void Framework::Text::remove(int index, const char* t, int len)
 {
-    if (index < 0 || !hat(t, len)
+    if (index < 0 || !has(t, len)
         || len <= 0) // check for invalid argument
         return;
-    int anz = anzahlVon(t, len); // count of t's
+    int anz = countOf(t, len); // count of t's
     if (index >= anz)            // check if an i-th t exists
         return;
-    int pos = positionVon(index, len, t); // position of the i-th t
+    int pos = positionOf(index, len, t); // position of the i-th t
     if (pos < 0) return;
     if (!length) return;
     char* res = new char[(__int64)length - len + 1];      // create new text
@@ -902,7 +902,7 @@ int Text::getLKick(int pos) const
 
 int Text::getOKick(int pos) const
 {
-    if (!hat('\n')) return 0;
+    if (!has('\n')) return 0;
     int lpos = 0;
     while (pos - lpos - 1 > 0 && txt[pos - lpos - 1] != '\n')
         ++lpos;
@@ -939,7 +939,7 @@ int Text::getRKick(int pos) const
 
 int Text::getUKick(int pos) const
 {
-    if (!hat('\n')) return length;
+    if (!has('\n')) return length;
     int lpos = 0;
     while (pos - lpos > 0 && txt[pos - lpos - 1] != '\n')
         ++lpos;
@@ -955,27 +955,27 @@ int Text::getUKick(int pos) const
     return pos + llen + lpos;
 }
 
-bool Text::hat(const Text& t) const // does the text contain t
+bool Text::has(const Text& t) const // does the text contain t
 {
-    return hat(t, t.getLength()); // check text
+    return has(t, t.getLength()); // check text
 }
 
-bool Text::hat(const char* t) const
+bool Text::has(const char* t) const
 {
-    return hat(t, textLength(t)); // check text
+    return has(t, textLength(t)); // check text
 }
 
-bool Framework::Text::hat(const char* t, int len) const
+bool Framework::Text::has(const char* t, int len) const
 {
-    return hat(0, t, len);
+    return has(0, t, len);
 }
 
-bool Framework::Text::hat(int searchStartIndex, const char* t) const
+bool Framework::Text::has(int searchStartIndex, const char* t) const
 {
-    return hat(searchStartIndex, t, textLength(t)); // check text
+    return has(searchStartIndex, t, textLength(t)); // check text
 }
 
-bool Framework::Text::hat(int searchStartIndex, const char* t, int len) const
+bool Framework::Text::has(int searchStartIndex, const char* t, int len) const
 {
     if (len <= 0
         || len > length - searchStartIndex) // check for invalid argument
@@ -1009,21 +1009,21 @@ bool Framework::Text::hat(int searchStartIndex, const char* t, int len) const
 //  t: The text whose content to search for
 //  return: (true) if the content is found. (false) otherwise
 //  pos: the position where the string should begin
-bool Text::hatAt(int pos, const Text& t) const
+bool Text::hasAt(int pos, const Text& t) const
 {
-    return hatAt(pos, t, t.getLength()); // check text
+    return hasAt(pos, t, t.getLength()); // check text
 }
 
 // Checks whether the text contains a specific string
 //  t: The string to search for
 //  return: (true) if the string is found. (false) otherwise
 //  pos: the position where the string should begin
-bool Text::hatAt(int pos, const char* t) const
+bool Text::hasAt(int pos, const char* t) const
 {
-    return hatAt(pos, t, textLength(t)); // check text
+    return hasAt(pos, t, textLength(t)); // check text
 }
 
-bool Framework::Text::hatAt(int pos, const char* t, int len) const
+bool Framework::Text::hasAt(int pos, const char* t, int len) const
 {
     if (len <= 0 || len + pos > length) // check for invalid argument
         return 0;
@@ -1033,7 +1033,7 @@ bool Framework::Text::hatAt(int pos, const char* t, int len) const
     return b;
 }
 
-bool Text::hat(char c) const // contains c
+bool Text::has(char c) const // contains c
 {
     bool ret = 0;
     int suchGCount = 0;
@@ -1052,21 +1052,21 @@ bool Text::hat(char c) const // contains c
 
 bool Text::beginnsWith(const char* t) const
 {
-    return hatAt(0, t);
+    return hasAt(0, t);
 }
 
 bool Text::endsWith(const char* t) const
 {
     int len = textLength(t);
-    return hatAt(length - len, t, len);
+    return hasAt(length - len, t, len);
 }
 
-bool Text::istGleich(const char* t) const // checks if the text equals t
+bool Text::isEqual(const char* t) const // checks if the text equals t
 {
-    return istGleich(t, textLength(t)); // check text
+    return isEqual(t, textLength(t)); // check text
 }
 
-bool Text::istGleich(
+bool Text::isEqual(
     const char* t, int len) const // checks if the text equals t
 {
     if (length != len) // check for invalid argument
@@ -1078,9 +1078,9 @@ bool Text::istGleich(
     return ret;
 }
 
-bool Text::istGleich(const Text& t) const
+bool Text::isEqual(const Text& t) const
 {
-    return istGleich(t, t.getLength()); // check text
+    return isEqual(t, t.getLength()); // check text
 }
 
 const char* Text::getText() const // returns the text
@@ -1088,7 +1088,7 @@ const char* Text::getText() const // returns the text
     return txt;
 }
 
-int Text::anzahlVon(char c) const // returns the count of c in the text
+int Text::countOf(char c) const // returns the count of c in the text
 {
     int ret = 0;
     int suchGCount = 0;
@@ -1113,13 +1113,13 @@ int Text::anzahlVon(char c) const // returns the count of c in the text
     return ret;
 }
 
-int Text::anzahlVon(
+int Text::countOf(
     const char* t) const // returns the count of t in the text
 {
-    return anzahlVon(t, textLength(t)); // check text
+    return countOf(t, textLength(t)); // check text
 }
 
-int Framework::Text::anzahlVon(const char* t, int len) const
+int Framework::Text::countOf(const char* t, int len) const
 {
     if (len <= 0 || len > length) // check for invalid argument
         return 0;
@@ -1148,12 +1148,12 @@ int Framework::Text::anzahlVon(const char* t, int len) const
     return ret;
 }
 
-int Text::anzahlVon(const Text& t) const
+int Text::countOf(const Text& t) const
 {
-    return anzahlVon(t, t.getLength()); // check text
+    return countOf(t, t.getLength()); // check text
 }
 
-int Text::positionVon(char c) const // returns the position of the first c
+int Text::positionOf(char c) const // returns the position of the first c
 {
     int suchGCount = 0;
     for (int i = 0; i < length; ++i) // search
@@ -1169,18 +1169,18 @@ int Text::positionVon(char c) const // returns the position of the first c
     return -1;
 }
 
-int Text::positionVon(
+int Text::positionOf(
 const char* t) const // returns the position of the first t
 {
-    return positionVon(textLength(t), t);
+    return positionOf(textLength(t), t);
 }
 
-int Framework::Text::positionVon(int len, const char* t) const
+int Framework::Text::positionOf(int len, const char* t) const
 {
-    return positionVon(0, t, len);
+    return positionOf(0, t, len);
 }
 
-int Text::positionVon(int searchStart, const char* t, int len) const
+int Text::positionOf(int searchStart, const char* t, int len) const
 {
     if (len <= 0
         || len > length - searchStart) // check for invalid argument
@@ -1209,12 +1209,12 @@ int Text::positionVon(int searchStart, const char* t, int len) const
     return -1;
 }
 
-int Text::positionVon(const Text& t) const
+int Text::positionOf(const Text& t) const
 {
-    return positionVon(t.getLength(), t); // check text
+    return positionOf(t.getLength(), t); // check text
 }
 
-int Text::positionVon(
+int Text::positionOf(
     char c, int index) const // returns the position of the i-th c
 {
     int ii = 0;
@@ -1242,13 +1242,13 @@ int Text::positionVon(
     return -1;
 }
 
-int Text::positionVon(
+int Text::positionOf(
     const char* t, int index) const // returns the position of the i-th t
 {
-    return positionVon(index, textLength(t), t); // check text
+    return positionOf(index, textLength(t), t); // check text
 }
 
-int Framework::Text::positionVon(int index, int len, const char* t) const
+int Framework::Text::positionOf(int index, int len, const char* t) const
 {
     if (len <= 0 || len > length) // check for invalid argument
         return 0;
@@ -1289,9 +1289,9 @@ int Framework::Text::positionVon(int index, int len, const char* t) const
     return -1;
 }
 
-int Text::positionVon(const Text& t, int i) const
+int Text::positionOf(const Text& t, int i) const
 {
-    return positionVon(i, t.getLength(), t); // check text
+    return positionOf(i, t.getLength(), t); // check text
 }
 
 Text* Text::getTeilText(
@@ -1492,7 +1492,7 @@ Text Text::operator+(const float num) const
 
 bool Text::operator==(const Text& right) const
 {
-    return istGleich(right, right.getLength());
+    return isEqual(right, right.getLength());
 }
 
 Text Text::fromArray(char* arr, int len)
@@ -1532,7 +1532,7 @@ void TextReader::setLPosition(__int64 pos, bool ende)
 // Reads from the text
 //  bytes: An array to be filled with bytes from the text
 //  len: How many bytes to read from the text
-void TextReader::lese(char* bytes, int len)
+void TextReader::read(char* bytes, int len)
 {
     int l = txt->getLength();
     len = (int)MIN(l - lPos, len);
@@ -1543,14 +1543,14 @@ void TextReader::lese(char* bytes, int len)
 
 // Reads the next line of the text
 //  return: The read line as text with line break
-Text* TextReader::leseZeile()
+Text* TextReader::readLine()
 {
-    if (istEnde()) return 0;
+    if (isEnd()) return 0;
     Text* ret = new Text("");
     __int64 len = txt->getLength();
     for (char c = 0; c != '\n' && lPos < len;)
     {
-        lese(&c, 1);
+        read(&c, 1);
         if (c) ret->append(&c, 1);
     }
     return ret;
@@ -1558,7 +1558,7 @@ Text* TextReader::leseZeile()
 
 // Checks whether the resource has been fully read
 //  return 1 if the resource has been fully read. 0 otherwise
-bool TextReader::istEnde() const
+bool TextReader::isEnd() const
 {
     return lPos >= txt->getLength();
 }
@@ -1577,7 +1577,7 @@ __int64 TextReader::getSize() const
 }
 
 // char* operationen
-int Framework::stringPositionVonChar(const char* string,
+int Framework::stringPositionOfChar(const char* string,
 char c,
 int num) // finds the position of the num-th c
          // in string, -1 if not found
@@ -1598,7 +1598,7 @@ int num) // finds the position of the num-th c
     return -1;
 }
 
-int Framework::stringPositionVonString(const char* string,
+int Framework::stringPositionOfString(const char* string,
 char* suche,
 int sBegPos) // finds the position of 'suche' in 'string' starting at
              // position 'sBegPos', -1 if not found
@@ -1771,7 +1771,7 @@ char Framework::smallOrBig(char c, bool gr)
     return (char)ret;
 }
 
-bool Framework::istSchreibbar(
+bool Framework::isWritable(
 unsigned char zeichen) // checks if zeichen is a printable character
 {
     if (zeichen > 32 && zeichen < 127) return 1;

Text.h

@@ -204,71 +204,71 @@ 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 World" ).ersetzen( 2, 5, "lt" );
+        //! Example: ( "Hallo World" ).replace( 2, 5, "lt" );
         //! results in: "Halt World"
-        DLLEXPORT void ersetzen(int p1, int p2, const char* t);
+        DLLEXPORT void replace(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 World" ).ersetzen( 2, 5, "lt", 2 );
+        //! position Example: ( "Hallo World" ).replace( 2, 5, "lt", 2 );
         //! results in: "Halt World"
-        DLLEXPORT void ersetzen(int p1, int p2, const char* t, int len);
+        DLLEXPORT void replace(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 World" ).ersetzen( 2, 5, new
+        //! corresponding position Example: ( "Hallo World" ).replace( 2, 5, new
         //! Text( "lt" ) ); results in: "Halt World"
-        DLLEXPORT void ersetzen(int p1, int p2, const Text& t);
+        DLLEXPORT void replace(int p1, int p2, const Text& t);
         //! Searches and replaces every occurrence of a specific character with
         //! another
         //!  c1: The character to be replaced
         //!  c2: The character to replace the other one with
-        DLLEXPORT void ersetzen(char c1, char c2);
+        DLLEXPORT void replace(char c1, char c2);
         //! Searches and replaces every occurrence of a specific string with
         //! another
         //!  t1: The string to be replaced
         //!  t2: The string to replace the other one with
-        DLLEXPORT void ersetzen(const char* t1, const char* t2);
+        DLLEXPORT void replace(const char* t1, const char* t2);
         //! Searches and replaces every occurrence of a specific string with
         //! another
         //! \param t1 The string to be replaced
         //! \param t2 The string to replace the other one with
         //! \param len1 The length of the string to be replaced
         //! \param len2 The length of the replacement string
-        DLLEXPORT void ersetzen(
+        DLLEXPORT void replace(
             const char* t1, int len1, const char* t2, int len2);
         //! Searches and replaces every occurrence of the content of a Text with
         //! another string
         //!  t1: The Text whose content is searched for and replaced
         //!  t2: The string to replace the occurrences of the Text with
-        DLLEXPORT void ersetzen(const Text& t1, const char* t2);
+        DLLEXPORT void replace(const Text& t1, const char* t2);
         //! Searches and replaces every occurrence of a string with the
         //! content of a Text
         //!  t1: The string to be replaced
         //!  t2: The Text whose content should replace the occurrences of the
         //!  string
-        DLLEXPORT void ersetzen(const char* t1, const Text& t2);
+        DLLEXPORT void replace(const char* t1, const Text& t2);
         //! Searches and replaces every occurrence of the content of a Text with
         //! the content of another Text
         //!  t1: The Text whose occurrences should be replaced
         //!  t2: The Text whose content should replace the occurrences
-        DLLEXPORT void ersetzen(const Text& t1, const Text& t2);
+        DLLEXPORT void replace(const Text& t1, const Text& t2);
         //! Replaces the i-th occurrence of a specific character with another
         //! character
         //! \param i Which occurrence of the character should be replaced
         //!  c1: The character whose i-th occurrence should be replaced
         //!  c2: The character to replace the i-th occurrence of the other
         //!  character
-        DLLEXPORT void ersetzen(int i, char c1, char c2);
+        DLLEXPORT void replace(int i, char c1, char c2);
         //! Replaces the i-th occurrence of a specific string with another
         //! string
         //! \param i Which occurrence of the string should be replaced
         //!  c1: The string whose i-th occurrence should be replaced
         //!  c2: The string to replace the i-th occurrence of the other string
-        DLLEXPORT void ersetzen(int i, const char* t1, const char* t2);
+        DLLEXPORT void replace(int i, const char* t1, const char* t2);
         //! Replaces the i-th occurrence of a specific string with another
         //! string
         //! \param i Which occurrence of the string should be replaced
@@ -277,27 +277,27 @@ namespace Framework
         //! string
         //! \param len1 The length of the string to be replaced
         //! \param len2 The length of the replacement string
-        DLLEXPORT void ersetzen(
+        DLLEXPORT void replace(
             int i, const char* t1, int len1, const char* t2, int len2);
         //! Replaces the i-th occurrence of the content of a Text with a string
         //! \param i Which occurrence of the Text should be replaced
         //!  c1: The Text whose i-th occurrence should be replaced
         //!  c2: The string to replace the i-th occurrence of the Text
-        DLLEXPORT void ersetzen(int i, const Text& t1, const char* t2);
+        DLLEXPORT void replace(int i, const Text& t1, const char* t2);
         //! Replaces the i-th occurrence of a specific string with the content
         //! of a Text
         //! \param i Which occurrence of the string should be replaced
         //!  c1: The string whose i-th occurrence should be replaced
         //!  c2: The Text whose content should replace the i-th occurrence of
         //!  the string
-        DLLEXPORT void ersetzen(int i, const char* t1, const Text& t2);
+        DLLEXPORT void replace(int i, const char* t1, const Text& t2);
         //! Replaces the i-th occurrence of a specific Text with the content
         //! of another Text
         //! \param i Which occurrence of the Text should be replaced
         //!  c1: The Text whose i-th occurrence should be replaced
         //!  c2: The Text whose content should replace the i-th occurrence of
         //!  the other Text
-        DLLEXPORT void ersetzen(int i, const Text& t1, const Text& t2);
+        DLLEXPORT void replace(int i, const Text& t1, const Text& t2);
         //! Clears the current text and creates a text consisting of a specific
         //! character with a specific length
         //! \param c The character the text should consist of
@@ -374,49 +374,49 @@ namespace Framework
         //! \param t The Text whose content should be searched for
         //! \return (true) if the content of the Text is found. (false)
         //! otherwise
-        DLLEXPORT bool hat(const Text& t) const;
+        DLLEXPORT bool has(const Text& t) const;
         //! Checks whether a specific string occurs in the text
         //! \param t The string to search for
         //! \return (true) if the string is found. (false) otherwise
-        DLLEXPORT bool hat(const char* t) const;
+        DLLEXPORT bool has(const char* t) const;
         //! Checks whether a specific string occurs in the text
         //! \param t The string to search for
         //! \param len The length of the string to search for
         //! \return (true) if the string is found. (false) otherwise
-        DLLEXPORT bool hat(const char* t, int len) const;
+        DLLEXPORT bool has(const char* t, int len) const;
         //! Checks whether a specific string occurs in the text
         //! \param searchStartIndex The index from which to start searching
         //! \param t The string to search for
         //! \return (true) if the string is found. (false) otherwise
-        DLLEXPORT bool hat(int searchStartIndex, const char* t) const;
+        DLLEXPORT bool has(int searchStartIndex, const char* t) const;
         //! Checks whether a specific string occurs in the text
         //! \param searchStartIndex The index from which to start searching
         //! \param t The string to search for
         //! \param len The length of the string to search for
         //! \return (true) if the string is found. (false) otherwise
-        DLLEXPORT bool hat(int searchStartIndex, const char* t, int len) const;
+        DLLEXPORT bool has(int searchStartIndex, const char* t, int len) const;
         //! Checks whether the content of another Text occurs at a specific
         //! position
         //! \param pos The position where the string should begin in the text
         //! \param t The Text whose content should be searched for
         //! \return (true) if the content of the Text is found. (false)
         //! otherwise
-        DLLEXPORT bool hatAt(int pos, const Text& t) const;
+        DLLEXPORT bool hasAt(int pos, const Text& t) const;
         //! Checks whether a specific string occurs at a specific position
         //! \param pos The position where the string should begin in the text
         //! \param t The string to search for
         //! \return (true) if the string is found. (false) otherwise
-        DLLEXPORT bool hatAt(int pos, const char* t) const;
+        DLLEXPORT bool hasAt(int pos, const char* t) const;
         //! Checks whether a specific string occurs at a specific position
         //! \param pos The position where the string should begin in the text
         //! \param t The string to search for
         //! \param len The length of the string to search for
         //! \return (true) if the string is found. (false) otherwise
-        DLLEXPORT bool hatAt(int pos, const char* t, int len) const;
+        DLLEXPORT bool hasAt(int pos, const char* t, int len) const;
         //! Checks whether a specific character occurs in the text
         //! \param c The character to search for
         //! \return (true) if the character is found. (false) otherwise
-        DLLEXPORT bool hat(char c) const;
+        DLLEXPORT bool has(char c) const;
         //! Checks whether the text starts with a specific string
         DLLEXPORT bool beginnsWith(const char* t) const;
         //! Checks whether the text ends with a specific string
@@ -425,80 +425,80 @@ namespace Framework
         //! \param t The string to compare with
         //! \return (true) if the content of the text equals the string. (false)
         //! otherwise
-        DLLEXPORT bool istGleich(const char* t) const;
+        DLLEXPORT bool isEqual(const char* t) const;
         //! Checks whether the text has the same content as a string
         //! \param t The string to compare with
         //! \param len The length of the string to compare
         //! \return (true) if the content of the text equals the string. (false)
         //! otherwise
-        DLLEXPORT bool istGleich(const char* t, int len) const;
+        DLLEXPORT bool isEqual(const char* t, int len) const;
         //! Checks whether the text has the same content as another Text
         //! \param t The Text whose content should be compared
         //! \return (true) if the contents match. (false) otherwise
-        DLLEXPORT bool istGleich(const Text& t) const;
+        DLLEXPORT bool isEqual(const Text& t) const;
         //! Returns the content of the text as a string
         DLLEXPORT const char* getText() const;
         //! Counts how often a specific character occurs in the text
         //! \param c The character to be counted
         //! \return The number of occurrences of the character in the text
-        DLLEXPORT int anzahlVon(char c) const;
+        DLLEXPORT int countOf(char c) const;
         //! Counts how often a specific string occurs in the text
         //! \param t The string to be counted
         //! \return The number of occurrences of the string in the text
-        DLLEXPORT int anzahlVon(const char* t) const;
+        DLLEXPORT int countOf(const char* t) const;
         //! Counts how often a specific string occurs in the text
         //! \param t The string to be counted
         //! \param len The length of the string to be counted
         //! \return The number of occurrences of the string in the text
-        DLLEXPORT int anzahlVon(const char* t, int len) const;
+        DLLEXPORT int countOf(const char* t, int len) const;
         //! Counts how often the content of a Text occurs in the text
         //! \param t The Text whose content should be counted
         //! \return The number of occurrences of the text content
-        DLLEXPORT int anzahlVon(const Text& t) const;
+        DLLEXPORT int countOf(const Text& t) const;
         //! Returns the first position of a specific character in the text
         //! \param c The character to be found
         //! \return The position of the first occurrence of the character
-        DLLEXPORT int positionVon(char c) const;
+        DLLEXPORT int positionOf(char c) const;
         //! Returns the first position of a specific string in the text
         //! \param t The string to be found
         //! \return The position of the first occurrence of the string
-        DLLEXPORT int positionVon(const char* t) const;
+        DLLEXPORT int positionOf(const char* t) const;
         //! Returns the first position of a specific string in the text
         //! \param len The length of the string to be found
         //! \param t The string to be found
         //! \return The position of the first occurrence of the string
-        DLLEXPORT int positionVon(int len, const char* t) const;
+        DLLEXPORT int positionOf(int len, const char* t) const;
         //! Returns the first position of a specific string in the text
         //! \param searchStart Index from which to start searching
         //! \param t The string to be found
         //! \return The position of the first occurrence of the string
-        DLLEXPORT int positionVon(
+        DLLEXPORT int positionOf(
             int searchStart, const char* t, int len) const;
         //! Returns the first position of a Text's content in the text
         //! \param t The Text whose content should be found
         //! \return The position of the first occurrence of the text content
-        DLLEXPORT int positionVon(const Text& t) const;
+        DLLEXPORT int positionOf(const Text& t) const;
         //! Returns the i-th position of a specific character in the text
         //! \param c The character to be found
         //! \param i Which occurrence should be found
         //! \return The position of the i-th occurrence of the character
-        DLLEXPORT int positionVon(char c, int i) const;
+        DLLEXPORT int positionOf(char c, int i) const;
         //! Returns the i-th position of a specific string in the text
         //! \param t The string to be found
         //! \param i Which occurrence should be found
         //! \return The position of the i-th occurrence of the string
-        DLLEXPORT int positionVon(const char* t, int i) const;
+        DLLEXPORT int positionOf(const char* t, int i) const;
         //! Returns the i-th position of a specific string in the text
         //! \param t The string to be found
         //! \param len The length of the string to be found
         //! \param i Which occurrence should be found
         //! \return The position of the i-th occurrence of the string
-        DLLEXPORT int positionVon(int i, int len, const char* t) const;
+        DLLEXPORT int positionOf(int i, int len, const char* t) const;
         //! Returns the i-th position of a Text's content in the text
         //! \param t The Text whose content should be found
         //! \param i Which occurrence should be found
         //! \return The position of the i-th occurrence of the text content
-        DLLEXPORT int positionVon(const Text& t, int i) const;
+        DLLEXPORT int positionOf(const Text& t, int i) const;
         //! Returns a Text containing a copy of a specific text section
         //!  p1: The start position of the text section
         //!  p2: The end position of the text section (not included)
@@ -589,13 +589,13 @@ namespace Framework
         //! Reads from the text
         //! \param bytes An array to be filled with bytes from the text
         //! \param len How many bytes should be read from the text
-        DLLEXPORT void lese(char* bytes, int len) override;
+        DLLEXPORT void read(char* bytes, int len) override;
         //! Reads the next line of the text
         //! \return The read line as Text with line break
-        DLLEXPORT Text* leseZeile() override;
+        DLLEXPORT Text* readLine() override;
         //! Checks whether the resource has been fully read
         //!  return 1 if the resource has been fully read. 0 otherwise
-        DLLEXPORT bool istEnde() const override;
+        DLLEXPORT bool isEnd() const override;
         //! Returns the index of the byte from the text that would be read next
         //! return -1 if an error occurred. Otherwise the position of the read
         //! pointer
@@ -610,7 +610,7 @@ namespace Framework
     //! \param num Which occurrence of the character should be found
     //! \return (-1) if there is no num-th occurrence of the character.
     //! Otherwise the position of the num-th occurrence in the string
-    DLLEXPORT int stringPositionVonChar(const char* string,
+    DLLEXPORT int stringPositionOfChar(const char* string,
         char c,
         int num); //! searches the position of the num-th c in string, -1 if not
                   //! found
@@ -620,7 +620,7 @@ namespace Framework
     //! \param sBegPos The position from which to start the search
     //! \return The position where the search string was first found.
     //! (-1) if nothing was found.
-    DLLEXPORT int stringPositionVonString(
+    DLLEXPORT int stringPositionOfString(
         const char* string, char* suche, int sBegPos);
 
     //! Copies a specific string to the operating system's clipboard
@@ -640,7 +640,7 @@ namespace Framework
     //! Determines whether a character is a printable character
     //! \param zeichen The character to be checked
     //! \return (true) if the character can be drawn. (false) otherwise
-    DLLEXPORT bool istSchreibbar(unsigned char zeichen);
+    DLLEXPORT bool isWritable(unsigned char zeichen);
     //! Converts a number from a string in any base to a number
     //! \param c The string containing the number
     //! \param system The base of the number

TextField.cpp

@@ -193,7 +193,7 @@ TextRenderer* TextField::TextStyleManager::zCurrentRenderer()
     if (renderer->getEntryCount() == 0) return 0;
     TextRenderer* tr = renderer->z(current.rendererIndex);
     if (!tr) tr = renderer->z(0);
-    if (tr) tr->setSchriftSize(current.fontSize);
+    if (tr) tr->setFontSize(current.fontSize);
     return tr;
 }
 
@@ -253,7 +253,7 @@ TextField::TextField()
       showChar(0),
       cpos(0),
       tickVal(0),
-      mausKlick(0)
+      mouseKlick(0)
 {
     charEvent = 0;
     horizontalScrollBar = new HScrollBar();
@@ -272,160 +272,160 @@ TextField::~TextField()
 void TextField::doMouseEvent(MouseEvent& me, bool userRet) // Mouse event
 {
     if (!userRet) return;
-    if (hatStyleNicht(Style::Editierbar))
+    if (hasStyleNot(Style::Editierbar))
     {
         int rbr = 0;
-        if (rahmen) rbr = rahmen->getRBreite();
-        if (((vertikalScrollBar && hatStyle(Style::VScroll))
-                || (horizontalScrollBar && hatStyle(Style::HScroll)))
+        if (border) rbr = border->getRWidth();
+        if (((vertikalScrollBar && hasStyle(Style::VScroll))
+                || (horizontalScrollBar && hasStyle(Style::HScroll)))
             && me.mx > rbr && me.mx < gr.x - rbr && me.my > rbr
             && me.my < gr.y - rbr)
         {
-            me.verarbeitet |= vertikalScrollBar->doMausMessage(
+            me.processed |= vertikalScrollBar->doMouseMessage(
                 gr.x - rbr - 15, rbr, 15, gr.y - rbr * 2, me);
-            me.verarbeitet |= horizontalScrollBar->doMausMessage(rbr,
+            me.processed |= horizontalScrollBar->doMouseMessage(rbr,
                 gr.y - rbr * 2 - 15,
                 gr.x - rbr * 2
-                    - ((vertikalScrollBar && hatStyle(Style::VScroll)) ? 15
+                    - ((vertikalScrollBar && hasStyle(Style::VScroll)) ? 15
                                                                        : 0),
                 15,
                 me);
         }
         if (me.mx >= 0 && me.mx <= gr.x && me.my >= 0 && me.my <= gr.y
-            && !me.verarbeitet && hatStyle(Style::Sichtbar))
+            && !me.processed && hasStyle(Style::Visible))
         {
-            int scrollHi = (vertikalScrollBar && hatStyle(Style::VScroll))
+            int scrollHi = (vertikalScrollBar && hasStyle(Style::VScroll))
                              ? vertikalScrollBar->getScroll()
                              : 0;
-            int scrollBr = (horizontalScrollBar && hatStyle(Style::HScroll))
+            int scrollBr = (horizontalScrollBar && hasStyle(Style::HScroll))
                              ? horizontalScrollBar->getScroll()
                              : 0;
             int xxx = me.mx - rbr + scrollBr;
             int yyy = me.my - rbr + scrollHi;
-            int mausChar = getTextIndexAt(xxx, yyy);
-            if (mausChar >= 0)
+            int mouseChar = getTextIndexAt(xxx, yyy);
+            if (mouseChar >= 0)
             {
-                TextStyle s = tm->getTextStyle(mausChar);
+                TextStyle s = tm->getTextStyle(mouseChar);
                 if (charEvent && s.interactParam)
-                    charEvent(mausChar, s.interactParam, me);
+                    charEvent(mouseChar, s.interactParam, me);
             }
-            if (charEvent) me.verarbeitet = 1;
+            if (charEvent) me.processed = 1;
         }
-        mausKlick = 0;
+        mouseKlick = 0;
         return;
     }
-    if (!me.verarbeitet)
+    if (!me.processed)
     {
-        if (hatStyleNicht(Style::Fokus))
+        if (hasStyleNot(Style::Focus))
         {
-            mausKlick = 0;
-            if (me.id == Framework::ME_PLinks) addStyle(Style::Fokus);
+            mouseKlick = 0;
+            if (me.id == Framework::ME_PLeft) addStyle(Style::Focus);
         }
         int rbr = 0;
-        if (rahmen) rbr = rahmen->getRBreite();
-        if (vertikalScrollBar && hatStyle(Style::VScroll))
+        if (border) rbr = border->getRWidth();
+        if (vertikalScrollBar && hasStyle(Style::VScroll))
         {
-            if (vertikalScrollBar->doMausMessage(
+            if (vertikalScrollBar->doMouseMessage(
                     gr.x - rbr - 15, rbr, 15, gr.y - rbr * 2, me))
             {
-                me.verarbeitet = 1;
+                me.processed = 1;
                 return;
             }
         }
-        if (horizontalScrollBar && hatStyle(Style::HScroll))
+        if (horizontalScrollBar && hasStyle(Style::HScroll))
         {
-            if (horizontalScrollBar->doMausMessage(rbr,
+            if (horizontalScrollBar->doMouseMessage(rbr,
                     gr.y - rbr - 15,
                     gr.x - rbr * 2
-                        - ((vertikalScrollBar && hatStyle(Style::VScroll)) ? 15
+                        - ((vertikalScrollBar && hasStyle(Style::VScroll)) ? 15
                                                                            : 0),
                     15,
                     me))
             {
-                me.verarbeitet = 1;
+                me.processed = 1;
                 return;
             }
         }
-        bool shift = getTastenStand(T_Shift);
-        bool strg = getTastenStand(T_Strg);
+        bool shift = getKeyState(T_Shift);
+        bool strg = getKeyState(T_Strg);
         int tbr = getTextWidth();
         int thi = getTextHeight();
-        int scrollHi = (vertikalScrollBar && hatStyle(Style::VScroll))
+        int scrollHi = (vertikalScrollBar && hasStyle(Style::VScroll))
                          ? vertikalScrollBar->getScroll()
                          : 0;
-        int scrollBr = (horizontalScrollBar && hatStyle(Style::HScroll))
+        int scrollBr = (horizontalScrollBar && hasStyle(Style::HScroll))
                          ? horizontalScrollBar->getScroll()
                          : 0;
         int xxx = me.mx - rbr + scrollBr;
         int yyy = me.my - rbr + scrollHi;
-        int mausChar = getTextIndexAt(xxx, yyy);
-        int scrollBreite = (vertikalScrollBar && hatStyle(Style::VScroll)) * 15;
+        int mouseChar = getTextIndexAt(xxx, yyy);
+        int scrollWidth = (vertikalScrollBar && hasStyle(Style::VScroll)) * 15;
         int scrollHeight
-            = (horizontalScrollBar && hatStyle(Style::HScroll)) * 15;
-        if (hatStyle(Style::HCenter))
-            xxx -= (((gr.x - scrollBreite) / 2) - tbr / 2) - rbr;
-        if (hatStyle(Style::VCenter) && hatStyleNicht(Style::VScroll))
+            = (horizontalScrollBar && hasStyle(Style::HScroll)) * 15;
+        if (hasStyle(Style::HCenter))
+            xxx -= (((gr.x - scrollWidth) / 2) - tbr / 2) - rbr;
+        if (hasStyle(Style::VCenter) && hasStyleNot(Style::VScroll))
             yyy -= (((gr.y - scrollHeight) / 2) - thi / 2) - rbr;
-        if (mausChar >= 0)
+        if (mouseChar >= 0)
         {
-            TextStyle s = tm->getTextStyle(mausChar);
-            if (charEvent) charEvent(mausChar, s.interactParam, me);
+            TextStyle s = tm->getTextStyle(mouseChar);
+            if (charEvent) charEvent(mouseChar, s.interactParam, me);
         }
         if (me.mx < gr.x - rbr - 15)
         {
             if (tm->renderer)
             {
                 int ncpos = getCurserPosAt(xxx, yyy);
-                if (me.id == Framework::ME_PLinks)
+                if (me.id == Framework::ME_PLeft)
                 {
                     if (ncpos != -1)
                     {
                         if (shift && cpos != ncpos)
-                            addAuswahl(MIN(cpos, ncpos), MAX(cpos, ncpos));
-                        else if (!shift && !mausKlick && !strg)
-                            deselectAuswahl();
+                            addSelahl(MIN(cpos, ncpos), MAX(cpos, ncpos));
+                        else if (!shift && !mouseKlick && !strg)
+                            deselectSelahl();
                         cpos = ncpos;
                         rend = 1;
-                        if (vertikalScrollBar && hatStyle(Style::VScroll))
+                        if (vertikalScrollBar && hasStyle(Style::VScroll))
                             updateVScroll();
-                        if (horizontalScrollBar && hatStyle(Style::HScroll))
+                        if (horizontalScrollBar && hasStyle(Style::HScroll))
                             updateHScroll();
                     }
-                    mausKlick = 1;
+                    mouseKlick = 1;
                 }
-                if (me.id == ME_Bewegung && mausKlick)
+                if (me.id == ME_Move && mouseKlick)
                 {
                     if (ncpos != -1)
                     {
                         rend = 1;
                         if (cpos != ncpos)
-                            invertAuswahl(MIN(cpos, ncpos), MAX(cpos, ncpos));
+                            invertSelection(MIN(cpos, ncpos), MAX(cpos, ncpos));
                         cpos = ncpos;
-                        if (vertikalScrollBar && hatStyle(Style::VScroll))
+                        if (vertikalScrollBar && hasStyle(Style::VScroll))
                             updateVScroll(cpos);
-                        if (horizontalScrollBar && hatStyle(Style::HScroll))
+                        if (horizontalScrollBar && hasStyle(Style::HScroll))
                             updateHScroll(cpos);
                     }
                 }
-                if (me.id == ME_RLinks)
+                if (me.id == ME_RLeft)
                 {
                     if (ncpos != -1)
                     {
                         rend = 1;
                         if (cpos != ncpos)
-                            invertAuswahl(MIN(cpos, ncpos), MAX(cpos, ncpos));
+                            invertSelection(MIN(cpos, ncpos), MAX(cpos, ncpos));
                         cpos = ncpos;
-                        if (vertikalScrollBar && hatStyle(Style::VScroll))
+                        if (vertikalScrollBar && hasStyle(Style::VScroll))
                             updateVScroll(cpos);
-                        if (horizontalScrollBar && hatStyle(Style::HScroll))
+                        if (horizontalScrollBar && hasStyle(Style::HScroll))
                             updateHScroll(cpos);
                     }
-                    mausKlick = 0;
+                    mouseKlick = 0;
                 }
             }
         }
     }
-    me.verarbeitet = 1;
+    me.processed = 1;
 }
 
 int TextField::getTextHeight() const
@@ -436,7 +436,7 @@ int TextField::getTextHeight() const
     int len = tm->text->getLength();
     const char* text = tm->text->getText();
     Text txtWithLineBreaks;
-    if (hatStyle(Style::AutoLineBreak))
+    if (hasStyle(Style::AutoLineBreak))
     {
         txtWithLineBreaks = addLineBreaksToText(tm->text->getText(),
             autoLineBreakSpacing ? autoLineBreakSpacing->getText() : "");
@@ -458,9 +458,9 @@ int TextField::getTextHeight() const
         TextRenderer* r = tm->zCurrentRenderer();
         if (r)
         {
-            int tmp = r->getZeilenHeight();
+            int tmp = r->getRowHeight();
             max = max >= tmp ? max : tmp;
-            if (max == tmp) abstand = r->getZeilenAbstand();
+            if (max == tmp) abstand = r->getLineSpacing();
         }
         tm->nextStyle();
     }
@@ -476,7 +476,7 @@ int TextField::getTextWidth() const
     int len = tm->text->getLength();
     const char* text = tm->text->getText();
     Text txtWithLineBreaks;
-    if (hatStyle(Style::AutoLineBreak))
+    if (hasStyle(Style::AutoLineBreak))
     {
         txtWithLineBreaks = addLineBreaksToText(tm->text->getText(),
             autoLineBreakSpacing ? autoLineBreakSpacing->getText() : "");
@@ -496,7 +496,7 @@ int TextField::getTextWidth() const
             continue;
         }
         TextRenderer* r = tm->zCurrentRenderer();
-        if (r) lineBr += r->getTextBreite(buff);
+        if (r) lineBr += r->getTextWidth(buff);
         tm->nextStyle();
     }
     if (lineBr > 0) maxBr = maxBr >= lineBr ? maxBr : lineBr;
@@ -505,7 +505,7 @@ int TextField::getTextWidth() const
 
 // charEvent: a function that is called when the mouse is on a
 // specific character and the interactParam in the style != 0
-//  call: charEvent( charIndex, interactParam, mausEreignis );
+//  call: charEvent( charIndex, interactParam, mouseEreignis );
 void TextField::setCharEvent(
     std::function<void(int, int, MouseEvent me)> charEvent)
 {
@@ -517,8 +517,8 @@ void TextField::setText(Text* txt) // sets the displayed text
     lockDrawable();
     if (!tm->text) tm->text = new Text();
     tm->text->setText(*txt);
-    if (hatStyle(Style::VScroll)) updateVScroll();
-    if (hatStyle(Style::HScroll)) updateHScroll();
+    if (hasStyle(Style::VScroll)) updateVScroll();
+    if (hasStyle(Style::HScroll)) updateHScroll();
     unlockDrawable();
     rend = 1;
     txt->release();
@@ -529,8 +529,8 @@ void TextField::setTextZ(Text* txt) // sets a pointer to the displayed text
     lockDrawable();
     if (tm->text) tm->text->release();
     tm->text = txt;
-    if (hatStyle(Style::VScroll)) updateVScroll();
-    if (hatStyle(Style::HScroll)) updateHScroll();
+    if (hasStyle(Style::VScroll)) updateVScroll();
+    if (hasStyle(Style::HScroll)) updateHScroll();
     rend = 1;
     unlockDrawable();
 }
@@ -540,8 +540,8 @@ void TextField::setText(const char* txt) // sets the displayed text
     lockDrawable();
     if (!tm->text) tm->text = new Text();
     tm->text->setText(txt);
-    if (hatStyle(Style::VScroll)) updateVScroll();
-    if (hatStyle(Style::HScroll)) updateHScroll();
+    if (hasStyle(Style::VScroll)) updateVScroll();
+    if (hasStyle(Style::HScroll)) updateHScroll();
     rend = 1;
     unlockDrawable();
 }
@@ -569,7 +569,7 @@ void TextField::setFormattedText(const char* txt)
 {
     lockDrawable();
     if (!tm->text) tm->text = new Text();
-    tm->textStyle.leeren();
+    tm->textStyle.clear();
     TextStyle current;
     current.beginIndex = 0;
     current.fontColor = 0xFFFFFFFF;
@@ -660,8 +660,8 @@ void TextField::setFormattedText(const char* txt)
     }
     tm->text->setText(result);
     tm->cleanupStyles();
-    if (hatStyle(Style::VScroll)) updateVScroll();
-    if (hatStyle(Style::HScroll)) updateHScroll();
+    if (hasStyle(Style::VScroll)) updateVScroll();
+    if (hasStyle(Style::HScroll)) updateHScroll();
     rend = 1;
     unlockDrawable();
 }
@@ -682,8 +682,8 @@ Text TextField::addLineBreaksToText(
     int x = 0;
     Text result = "";
     int len = (int)strlen(txt);
-    int maxBr = getBreite();
-    if (hatStyle(Style::VScroll) && vertikalScrollBar) maxBr -= 15;
+    int maxBr = getWidth();
+    if (hasStyle(Style::VScroll) && vertikalScrollBar) maxBr -= 15;
     tm->resetIteration();
     TextStyle last;
     last.beginIndex = 0;
@@ -750,7 +750,7 @@ Text TextField::addLineBreaksToText(
         {
             lastPos = i;
             lastPos2 = result.getLength();
-            x += tm->zCurrentRenderer()->getTextBreite(" ");
+            x += tm->zCurrentRenderer()->getTextWidth(" ");
             result += " ";
             tm->nextStyle();
             continue;
@@ -759,7 +759,7 @@ Text TextField::addLineBreaksToText(
         {
             lastPos = i;
             lastPos2 = result.getLength();
-            x += tm->zCurrentRenderer()->getTextBreite("\t");
+            x += tm->zCurrentRenderer()->getTextWidth("\t");
             result += "\t";
             tm->nextStyle();
             continue;
@@ -774,14 +774,14 @@ Text TextField::addLineBreaksToText(
             continue;
         }
         char buff[2] = {txt[i], 0};
-        x += tm->zCurrentRenderer()->getTextBreite(buff);
+        x += tm->zCurrentRenderer()->getTextWidth(buff);
         result += buff;
         if (x > maxBr && lastPos > -1)
         {
             result.remove(lastPos2, result.getLength());
             result += "\n";
             result += spacing;
-            x = tm->zCurrentRenderer()->getTextBreite(spacing);
+            x = tm->zCurrentRenderer()->getTextWidth(spacing);
             i = lastPos;
             tm->stepTo(lastPos);
             lastPos = -1;
@@ -807,7 +807,7 @@ void TextField::setTextStyle(int begin, int end, TextStyle style)
     tm->setTextStyle(begin, end, style);
 }
 
-void TextField::addZeile(const char* zeile) // appends a line
+void TextField::addRow(const char* zeile) // appends a line
 {
     if (tm->text)
     {
@@ -822,20 +822,20 @@ void TextField::addZeile(const char* zeile) // appends a line
                     .rendererIndex);
         if (r)
         {
-            bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
-            int rbr = (rahmen && hatStyle(Style::Border)) ? rahmen->getRBreite()
+            bool vs = vertikalScrollBar && hasStyle(Style::VScroll);
+            int rbr = (border && hasStyle(Style::Border)) ? border->getRWidth()
                                                           : 0;
-            r->setSchriftSize(
+            r->setFontSize(
                 tm->textStyle.get(tm->textStyle.getEntryCount() - 1)
                     .fontSize);
-            r->textFormatieren(txt, gr.x - ((int)vs * 15) - rbr * 2);
+            r->formatText(txt, gr.x - ((int)vs * 15) - rbr * 2);
         }
         lockDrawable();
         tm->text->append(txt->getText());
         unlockDrawable();
         txt->release();
-        if (hatStyle(Style::VScroll)) updateVScroll();
-        if (hatStyle(Style::HScroll)) updateHScroll();
+        if (hasStyle(Style::VScroll)) updateVScroll();
+        if (hasStyle(Style::HScroll)) updateHScroll();
         rend = 1;
     }
 }
@@ -843,7 +843,7 @@ void TextField::addZeile(const char* zeile) // appends a line
 // Appends a line to the text
 //  zeile: The new line
 //  color: The color of the line
-void TextField::addZeile(const char* zeile, int color)
+void TextField::addRow(const char* zeile, int color)
 {
     if (tm->text)
     {
@@ -858,29 +858,29 @@ void TextField::addZeile(const char* zeile, int color)
                     .rendererIndex);
         if (r)
         {
-            bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
-            int rbr = (rahmen && hatStyle(Style::Border)) ? rahmen->getRBreite()
+            bool vs = vertikalScrollBar && hasStyle(Style::VScroll);
+            int rbr = (border && hasStyle(Style::Border)) ? border->getRWidth()
                                                           : 0;
-            r->setSchriftSize(
+            r->setFontSize(
                 tm->textStyle.get(tm->textStyle.getEntryCount() - 1)
                     .fontSize);
-            r->textFormatieren(txt, gr.x - ((int)vs * 15) - rbr * 2);
+            r->formatText(txt, gr.x - ((int)vs * 15) - rbr * 2);
         }
         lockDrawable();
         tm->text->append(txt->getText());
-        setSchriftFarbe(tm->text->getLength() - txt->getLength(),
+        setFontColor(tm->text->getLength() - txt->getLength(),
             tm->text->getLength(),
             color);
         unlockDrawable();
         txt->release();
-        if (hatStyle(Style::VScroll)) updateVScroll();
-        if (hatStyle(Style::HScroll)) updateHScroll();
+        if (hasStyle(Style::VScroll)) updateVScroll();
+        if (hasStyle(Style::HScroll)) updateHScroll();
         rend = 1;
     }
 }
 
 // Deselects all text sections
-void TextField::deselectAuswahl()
+void TextField::deselectSelahl()
 {
     for (int i = 0; i < tm->textStyle.getEntryCount(); i++)
     {
@@ -894,42 +894,42 @@ void TextField::deselectAuswahl()
     tm->cleanupStyles();
 }
 
-void TextField::setAuswahl(int pos1, int pos2) // sets the selected text
+void TextField::setSelection(int pos1, int pos2) // sets the selected text
 {
-    deselectAuswahl();
+    deselectSelahl();
     TextStyle s = tm->getTextStyle(pos1);
     s.selected = 1;
     tm->setTextStyle(pos1, pos2, s);
 }
 
-void TextField::setAuswahl(Punkt& auswahl)
+void TextField::setSelection(Point& selection)
 {
-    deselectAuswahl();
-    TextStyle s = tm->getTextStyle(auswahl.x);
+    deselectSelahl();
+    TextStyle s = tm->getTextStyle(selection.x);
     s.selected = 1;
-    tm->setTextStyle(auswahl.x, auswahl.y, s);
+    tm->setTextStyle(selection.x, selection.y, s);
     rend = 1;
 }
 
-void TextField::addAuswahl(int pos1, int pos2)
+void TextField::addSelahl(int pos1, int pos2)
 {
     TextStyle s = tm->getTextStyle(pos1);
     s.selected = 1;
     tm->setTextStyle(pos1, pos2, s);
 }
 
-void TextField::addAuswahl(Punkt& auswahl)
+void TextField::addSelahl(Point& selection)
 {
-    TextStyle s = tm->getTextStyle(auswahl.x);
+    TextStyle s = tm->getTextStyle(selection.x);
     s.selected = 1;
-    tm->setTextStyle(auswahl.x, auswahl.y, s);
+    tm->setTextStyle(selection.x, selection.y, s);
     rend = 1;
 }
 
 // Sets the selected text section
 //  begin: The cursor position in the text
 //  end: The position in the text up to which the text should be colored
-void TextField::invertAuswahl(int begin, int end)
+void TextField::invertSelection(int begin, int end)
 {
     for (int i = begin; i < end; i++)
     {
@@ -942,7 +942,7 @@ void TextField::invertAuswahl(int begin, int end)
 
 // replaces all selected text sections with a text
 //  text: the new text
-void TextField::replaceAuswahl(const char* text)
+void TextField::replaceSelection(const char* text)
 {
     tm->cleanupStyles();
     int sa = tm->textStyle.getEntryCount();
@@ -970,7 +970,7 @@ void TextField::replaceAuswahl(const char* text)
 void TextField::setTextRendererZ(TextRenderer* textRd)
 {
     if (tm->renderer)
-        tm->renderer->leeren();
+        tm->renderer->clear();
     else
         tm->renderer = new RCArray<TextRenderer>();
     tm->renderer->add(textRd);
@@ -993,29 +993,29 @@ void TextField::setTextRendererZ(RCArray<TextRenderer>* textRd)
     tm->renderer = textRd;
 }
 
-void TextField::setFontZ(Font* schrift) // sets a pointer to the font
+void TextField::setFontZ(Font* font) // sets a pointer to the font
 {
     if (!tm->renderer) tm->renderer = new RCArray<TextRenderer>();
     if (!tm->renderer->getEntryCount())
-        tm->renderer->add(new TextRenderer(schrift));
+        tm->renderer->add(new TextRenderer(font));
     else
-        tm->renderer->z(0)->setFontZ(schrift);
+        tm->renderer->z(0)->setFontZ(font);
     rend = 1;
 }
 
 // Sets a pointer to the font
 //  rendererIndex: The index of the renderer whose font should be set
-//  schrift: The font to be used for text drawing.
-void TextField::setFontZ(int rendererIndex, Font* schrift)
+//  font: The font to be used for text drawing.
+void TextField::setFontZ(int rendererIndex, Font* font)
 {
     if (!tm->renderer) tm->renderer = new RCArray<TextRenderer>();
     if (tm->renderer->getEntryCount() <= rendererIndex)
-        tm->renderer->add(new TextRenderer(schrift), rendererIndex);
+        tm->renderer->add(new TextRenderer(font), rendererIndex);
     else
-        tm->renderer->z(rendererIndex)->setFontZ(schrift);
+        tm->renderer->z(rendererIndex)->setFontZ(font);
 }
 
-void TextField::setSchriftSize(unsigned char gr) // sets the font size
+void TextField::setFontSize(unsigned char gr) // sets the font size
 {
     TextStyle s = tm->textStyle.get(0);
     s.fontSize = gr;
@@ -1027,7 +1027,7 @@ void TextField::setSchriftSize(unsigned char gr) // sets the font size
 //  begin: The index of the first affected character
 //  end: The index of the first unaffected character
 //  gr: The font size to be used for text drawing
-void TextField::setSchriftSize(int begin, int end, unsigned char gr)
+void TextField::setFontSize(int begin, int end, unsigned char gr)
 {
     TextStyle s = tm->getTextStyle(begin);
     s.fontSize = gr;
@@ -1035,7 +1035,7 @@ void TextField::setSchriftSize(int begin, int end, unsigned char gr)
     rend = 1;
 }
 
-void TextField::setSchriftFarbe(int fc) // sets the font color
+void TextField::setFontColor(int fc) // sets the font color
 {
     TextStyle s = tm->textStyle.get(0);
     s.fontColor = fc;
@@ -1047,7 +1047,7 @@ void TextField::setSchriftFarbe(int fc) // sets the font color
 //  begin: The index of the first affected character
 //  end: The index of the first unaffected character
 //  fc: The color to be used for text drawing
-void TextField::setSchriftFarbe(int begin, int end, int fc)
+void TextField::setFontColor(int begin, int end, int fc)
 {
     TextStyle s = tm->getTextStyle(begin);
     s.fontColor = fc;
@@ -1061,10 +1061,10 @@ void TextField::setSchowChar(unsigned char c) // for password field *
     rend = 1;
 }
 
-void TextField::setVScrollZuZeile(int zeile) // scrolls to line
+void TextField::setVScrollToRow(int zeile) // scrolls to line
 {
     if (vertikalScrollBar && tm->renderer && tm->renderer->getEntryCount()
-        && tm->text && hatStyle(Style::Mehrzeilig))
+        && tm->text && hasStyle(Style::Mehrzeilig))
     {
         lockDrawable();
         tm->resetIteration();
@@ -1073,7 +1073,7 @@ void TextField::setVScrollZuZeile(int zeile) // scrolls to line
         int lnum = 0;
         const char* text = tm->text->getText();
         Text txtWithLineBreaks;
-        if (hatStyle(Style::AutoLineBreak))
+        if (hasStyle(Style::AutoLineBreak))
         {
             txtWithLineBreaks = addLineBreaksToText(tm->text->getText(),
                 autoLineBreakSpacing ? autoLineBreakSpacing->getText() : "");
@@ -1094,7 +1094,7 @@ void TextField::setVScrollZuZeile(int zeile) // scrolls to line
             TextRenderer* r = tm->zCurrentRenderer();
             if (r)
             {
-                int tmp = r->getZeilenAbstand() + r->getZeilenHeight();
+                int tmp = r->getLineSpacing() + r->getRowHeight();
                 max = max >= tmp ? max : tmp;
             }
             tm->nextStyle();
@@ -1115,18 +1115,18 @@ void TextField::updateVScroll(int pos) // scrolls down
         int sPosZH = 0;
         if (tm->text && tm->renderer)
         {
-            if (hatStyleNicht(Style::Mehrzeilig)) tm->text->remove('\n');
+            if (hasStyleNot(Style::Mehrzeilig)) tm->text->remove('\n');
             hi = gr.y;
-            if (hatStyle(Style::Border) && rahmen)
-                hi -= rahmen->getRBreite() * 2;
-            if (hatStyle(Style::HScroll) && horizontalScrollBar) hi -= 15;
+            if (hasStyle(Style::Border) && border)
+                hi -= border->getRWidth() * 2;
+            if (hasStyle(Style::HScroll) && horizontalScrollBar) hi -= 15;
             int th = 0;
             lockDrawable();
             tm->resetIteration();
             int len = tm->text->getLength();
             const char* text = tm->text->getText();
             Text txtWithLineBreaks;
-            if (hatStyle(Style::AutoLineBreak))
+            if (hasStyle(Style::AutoLineBreak))
             {
                 txtWithLineBreaks = addLineBreaksToText(tm->text->getText(),
                     autoLineBreakSpacing ? autoLineBreakSpacing->getText()
@@ -1154,7 +1154,7 @@ void TextField::updateVScroll(int pos) // scrolls down
                 TextRenderer* r = tm->zCurrentRenderer();
                 if (r)
                 {
-                    int tmp = r->getZeilenAbstand() + r->getZeilenHeight();
+                    int tmp = r->getLineSpacing() + r->getRowHeight();
                     max = max >= tmp ? max : tmp;
                 }
                 tm->nextStyle();
@@ -1183,10 +1183,10 @@ void TextField::updateHScroll(int pos) // scrolls to cursor position
     lockDrawable();
     if (horizontalScrollBar && tm->text && tm->renderer)
     {
-        if (hatStyleNicht(Style::Mehrzeilig)) tm->text->remove('\n');
+        if (hasStyleNot(Style::Mehrzeilig)) tm->text->remove('\n');
         int br = gr.x;
-        if (hatStyle(Style::Border) && rahmen) br -= rahmen->getRBreite() * 2;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar) br -= 15;
+        if (hasStyle(Style::Border) && border) br -= border->getRWidth() * 2;
+        if (hasStyle(Style::VScroll) && vertikalScrollBar) br -= 15;
         tm->resetIteration();
         int maxBr = 0;
         int len = tm->text->getLength();
@@ -1207,7 +1207,7 @@ void TextField::updateHScroll(int pos) // scrolls to cursor position
             TextRenderer* r = tm->zCurrentRenderer();
             if (r)
             {
-                lineBr += r->getTextBreite(buff);
+                lineBr += r->getTextWidth(buff);
                 if (i <= pos) cbr = lineBr;
             }
             tm->nextStyle();
@@ -1231,9 +1231,9 @@ int TextField::getNeededWidth()
     lockDrawable();
     if (tm->text && tm->renderer) maxBr = getTextWidth();
     unlockDrawable();
-    bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
-    bool r = rahmen && hatStyle(Style::Border);
-    return maxBr + (r ? rahmen->getRBreite() * 2 : 0) + (vs ? 15 : 0);
+    bool vs = vertikalScrollBar && hasStyle(Style::VScroll);
+    bool r = border && hasStyle(Style::Border);
+    return maxBr + (r ? border->getRWidth() * 2 : 0) + (vs ? 15 : 0);
 }
 
 // Returns the height in pixels needed to fully display the current text with
@@ -1244,14 +1244,14 @@ int TextField::getNeededHeight()
     lockDrawable();
     if (tm->text && tm->renderer) th = getTextHeight();
     unlockDrawable();
-    bool hs = horizontalScrollBar && hatStyle(Style::HScroll);
-    bool r = rahmen && hatStyle(Style::Border);
-    return th + (r ? rahmen->getRBreite() * 2 : 0) + (hs ? 15 : 0);
+    bool hs = horizontalScrollBar && hasStyle(Style::HScroll);
+    bool r = border && hasStyle(Style::Border);
+    return th + (r ? border->getRWidth() * 2 : 0) + (hs ? 15 : 0);
 }
 
 bool TextField::tick(double tickval) // tick
 {
-    if (hatStyle(Style::Fokus))
+    if (hasStyle(Style::Focus))
     {
         if (tickVal < 0.5 && tickVal + tickval >= 0.5) rend = 1;
         if (tickVal >= 0.5 && tickVal + tickval >= 1) rend = 1;
@@ -1263,21 +1263,21 @@ bool TextField::tick(double tickval) // tick
 
 void TextField::doKeyboardEvent(KeyboardEvent& te)
 {
-    bool ntakc = !te.verarbeitet;
-    if (te.verarbeitet || hatStyleNicht(Style::Fokus)) return;
+    bool ntakc = !te.processed;
+    if (te.processed || hasStyleNot(Style::Focus)) return;
     if (!tak) return;
     getThis();
     if (tak(takParam, this, te))
     {
-        if (hatStyleNicht(Style::Editierbar))
+        if (hasStyleNot(Style::Editierbar))
         {
             release();
             return;
         }
         if (te.id == TE_Press)
         {
-            bool shift = getTastenStand(T_Shift);
-            bool strg = getTastenStand(T_Strg);
+            bool shift = getKeyState(T_Shift);
+            bool strg = getKeyState(T_Strg);
             switch (te.virtualKey)
             {
             case T_Entf:
@@ -1289,8 +1289,8 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                     while (cpos > 0 && tm->getTextStyle(cpos - 1).selected)
                         cpos = tm->getTextStyle(cpos - 1).beginIndex;
                 }
-                replaceAuswahl("");
-                deselectAuswahl();
+                replaceSelection("");
+                deselectSelahl();
                 rend = 1;
                 break;
             case T_BackSpace:
@@ -1305,12 +1305,12 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                     while (cpos > 0 && tm->getTextStyle(cpos - 1).selected)
                         cpos = tm->getTextStyle(cpos - 1).beginIndex;
                 }
-                replaceAuswahl("");
-                deselectAuswahl();
+                replaceSelection("");
+                deselectSelahl();
                 rend = 1;
                 break;
             case T_Enter:
-                if (hatStyle(TextField::Style::Mehrzeilig))
+                if (hasStyle(TextField::Style::Mehrzeilig))
                 {
                     if (!tm->getTextStyle(cpos).selected)
                         tm->insertText(cpos, "\n");
@@ -1320,7 +1320,7 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                         while (cpos > 0 && tm->getTextStyle(cpos - 1).selected)
                             cpos = tm->getTextStyle(cpos - 1).beginIndex;
                     }
-                    replaceAuswahl("\n");
+                    replaceSelection("\n");
                     ++cpos;
                     rend = 1;
                 }
@@ -1331,12 +1331,12 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                     if (strg)
                     {
                         int tmp = tm->text->getLKick(cpos);
-                        invertAuswahl(tmp, cpos);
+                        invertSelection(tmp, cpos);
                         cpos = tmp;
                     }
                     else
                     {
-                        invertAuswahl(cpos - 1, cpos);
+                        invertSelection(cpos - 1, cpos);
                         --cpos;
                     }
                 }
@@ -1346,16 +1346,16 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                         cpos = tm->text->getLKick(cpos);
                     else
                         --cpos;
-                    deselectAuswahl();
+                    deselectSelahl();
                 }
                 rend = 1;
                 break;
             case T_Oben:
                 {
                     int tmp = tm->text->getOKick(cpos);
-                    invertAuswahl(tmp, cpos);
+                    invertSelection(tmp, cpos);
                     cpos = tmp;
-                    if (!shift) deselectAuswahl();
+                    if (!shift) deselectSelahl();
                     rend = 1;
                     break;
                 }
@@ -1365,12 +1365,12 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                     if (strg)
                     {
                         int tmp = tm->text->getRKick(cpos);
-                        invertAuswahl(cpos, tmp);
+                        invertSelection(cpos, tmp);
                         cpos = tmp;
                     }
                     else
                     {
-                        invertAuswahl(cpos, cpos + 1);
+                        invertSelection(cpos, cpos + 1);
                         ++cpos;
                     }
                 }
@@ -1380,16 +1380,16 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                         cpos = tm->text->getRKick(cpos);
                     else
                         ++cpos;
-                    deselectAuswahl();
+                    deselectSelahl();
                 }
                 rend = 1;
                 break;
             case T_Unten:
                 {
                     int tmp = tm->text->getUKick(cpos);
-                    invertAuswahl(cpos, tmp);
+                    invertSelection(cpos, tmp);
                     cpos = tmp;
-                    if (!shift) deselectAuswahl();
+                    if (!shift) deselectSelahl();
                     rend = 1;
                     break;
                 }
@@ -1449,23 +1449,23 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
                                 cpos > 0 && tm->getTextStyle(cpos - 1).selected)
                                 cpos = tm->getTextStyle(cpos - 1).beginIndex;
                         }
-                        replaceAuswahl(txt);
+                        replaceSelection(txt);
                         cpos += textLength(txt);
                         rend = 1;
                     }
                     break;
                 }
-                if (istSchreibbar(te.taste[0]))
+                if (isWritable(te.key[0]))
                 {
                     if (!tm->getTextStyle(cpos).selected)
-                        tm->insertText(cpos, te.taste);
+                        tm->insertText(cpos, te.key);
                     else
                     {
                         cpos = tm->getTextStyle(cpos).beginIndex;
                         while (cpos > 0 && tm->getTextStyle(cpos - 1).selected)
                             cpos = tm->getTextStyle(cpos - 1).beginIndex;
                     }
-                    replaceAuswahl(te.taste);
+                    replaceSelection(te.key);
                     ++cpos;
                     rend = 1;
                 }
@@ -1474,18 +1474,18 @@ void TextField::doKeyboardEvent(KeyboardEvent& te)
         }
         if (cpos < 0) cpos = 0;
         if (cpos > tm->text->getLength()) cpos = tm->text->getLength();
-        if (hatStyle(Style::VScroll)) updateVScroll(cpos);
-        if (hatStyle(Style::HScroll)) updateHScroll(cpos);
-        te.verarbeitet = 1;
+        if (hasStyle(Style::VScroll)) updateVScroll(cpos);
+        if (hasStyle(Style::HScroll)) updateHScroll(cpos);
+        te.processed = 1;
     }
-    if (ntakc && te.verarbeitet && nTak)
-        te.verarbeitet = nTak(ntakParam, this, te);
+    if (ntakc && te.processed && nTak)
+        te.processed = nTak(ntakParam, this, te);
     release();
 }
 
 void TextField::render(Image& zRObj) // draws to zRObj
 {
-    if (hatStyleNicht(Style::Sichtbar)) return;
+    if (hasStyleNot(Style::Visible)) return;
     DrawableBackground::render(zRObj);
     if (!tm->text || !tm->renderer) return;
     lockDrawable();
@@ -1494,23 +1494,23 @@ void TextField::render(Image& zRObj) // draws to zRObj
         unlockDrawable();
         return;
     }
-    if (hatStyleNicht(Style::Mehrzeilig)) tm->text->remove('\n');
+    if (hasStyleNot(Style::Mehrzeilig)) tm->text->remove('\n');
     int tbr = getTextWidth();
     int thi = getTextHeight();
     int xxx = 0;
     int yyy = 0;
-    int breite = innenSize.x;
+    int Width = innenSize.x;
     int height = innenSize.y;
-    bool hs = horizontalScrollBar && hatStyle(Style::HScroll);
-    bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
+    bool hs = horizontalScrollBar && hasStyle(Style::HScroll);
+    bool vs = vertikalScrollBar && hasStyle(Style::VScroll);
     if (vs) yyy -= vertikalScrollBar->getScroll();
     if (hs) xxx -= horizontalScrollBar->getScroll();
-    if (hatStyle(Style::HCenter) && !hs) xxx = (breite / 2) - tbr / 2;
+    if (hasStyle(Style::HCenter) && !hs) xxx = (Width / 2) - tbr / 2;
     int x = xxx;
     int len = tm->text->getLength();
     const char* text = tm->text->getText();
     Text txtWithLineBreaks;
-    if (hatStyle(Style::AutoLineBreak))
+    if (hasStyle(Style::AutoLineBreak))
     {
         txtWithLineBreaks = addLineBreaksToText(tm->text->getText(),
             autoLineBreakSpacing ? autoLineBreakSpacing->getText() : "",
@@ -1522,9 +1522,9 @@ void TextField::render(Image& zRObj) // draws to zRObj
     tm->resetIteration();
     if (thi == 0)
     {
-        thi = tm->zCurrentRenderer()->getZeilenHeight();
+        thi = tm->zCurrentRenderer()->getRowHeight();
     }
-    if (hatStyle(Style::VCenter) && !vs) yyy = (height / 2) - thi / 2;
+    if (hasStyle(Style::VCenter) && !vs) yyy = (height / 2) - thi / 2;
     int y = yyy;
     TextStyle& style = tm->currentStyle();
     int maxLH = 0;
@@ -1536,24 +1536,24 @@ void TextField::render(Image& zRObj) // draws to zRObj
         if (i < len && tm->zCurrentRenderer())
             tm->zCurrentRenderer()->renderChar(x,
                 y,
-                istSchreibbar(showChar) ? showChar : text[i],
+                isWritable(showChar) ? showChar : text[i],
                 zRObj,
                 style.selected ? style.selectedColor : style.fontColor,
                 style.underlined,
                 style.selected,
                 style.selectedBackcroundColor);
-        if (i - corrector == cpos && tickVal <= 0.5 && hatStyle(Style::Fokus)
-            && hatStyle(Style::Editierbar) && tm->zCurrentRenderer())
-            zRObj.drawLinieV(
-                oldX, y, tm->zCurrentRenderer()->getZeilenHeight(), 0xFFFF5555);
+        if (i - corrector == cpos && tickVal <= 0.5 && hasStyle(Style::Focus)
+            && hasStyle(Style::Editierbar) && tm->zCurrentRenderer())
+            zRObj.drawLineV(
+                oldX, y, tm->zCurrentRenderer()->getRowHeight(), 0xFFFF5555);
         if (i >= realLen || text[i] != tm->text->getText()[i])
         {
             corrector++;
         }
         if (tm->zCurrentRenderer())
         {
-            int tmp = tm->zCurrentRenderer()->getZeilenHeight()
-                    + tm->zCurrentRenderer()->getZeilenAbstand();
+            int tmp = tm->zCurrentRenderer()->getRowHeight()
+                    + tm->zCurrentRenderer()->getLineSpacing();
             maxLH = tmp > maxLH ? tmp : maxLH;
         }
         if (i < len && text[i] == '\n')
@@ -1643,7 +1643,7 @@ TextRenderer* TextField::zTextRenderer(int index) const
     return 0;
 }
 
-unsigned char TextField::getSchriftSize() const // returns the font size
+unsigned char TextField::getFontSize() const // returns the font size
 {
     tm->resetIteration();
     return tm->current.fontSize;
@@ -1651,13 +1651,13 @@ unsigned char TextField::getSchriftSize() const // returns the font size
 
 // Returns the font size
 //  index: The index of the character
-unsigned char TextField::getSchriftSize(int index) const
+unsigned char TextField::getFontSize(int index) const
 {
     tm->resetIteration();
     return tm->current.fontSize;
 }
 
-int TextField::getSchriftFarbe() const // returns the font color
+int TextField::getFontColor() const // returns the font color
 {
     tm->resetIteration();
     return tm->current.fontColor;
@@ -1665,7 +1665,7 @@ int TextField::getSchriftFarbe() const // returns the font color
 
 // Returns the font color in A8R8G8B8 format
 //  index: The index of the character
-int TextField::getSchriftFarbe(int index) const
+int TextField::getFontColor(int index) const
 {
     return tm->getTextStyle(index).fontColor;
 }
@@ -1698,20 +1698,20 @@ int TextField::getTextIndexAt(int mx, int my) const
     int thi = getTextHeight();
     int xxx = 0;
     int yyy = 0;
-    int breite = innenSize.x;
+    int Width = innenSize.x;
     int height = innenSize.y;
-    bool hs = horizontalScrollBar && hatStyle(Style::HScroll);
-    bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
+    bool hs = horizontalScrollBar && hasStyle(Style::HScroll);
+    bool vs = vertikalScrollBar && hasStyle(Style::VScroll);
     if (vs) yyy -= vertikalScrollBar->getScroll();
     if (hs) xxx -= horizontalScrollBar->getScroll();
-    if (hatStyle(Style::HCenter) && !hs) xxx = (breite / 2) - tbr / 2;
-    if (hatStyle(Style::VCenter) && !vs) yyy = (height / 2) - thi / 2;
+    if (hasStyle(Style::HCenter) && !hs) xxx = (Width / 2) - tbr / 2;
+    if (hasStyle(Style::VCenter) && !vs) yyy = (height / 2) - thi / 2;
     int x = xxx;
     int y = yyy;
     int len = tm->text->getLength();
     const char* text = tm->text->getText();
     Text txtWithLineBreaks;
-    if (hatStyle(Style::AutoLineBreak))
+    if (hasStyle(Style::AutoLineBreak))
     {
         txtWithLineBreaks = addLineBreaksToText(tm->text->getText(),
             autoLineBreakSpacing ? autoLineBreakSpacing->getText() : "");
@@ -1728,14 +1728,14 @@ int TextField::getTextIndexAt(int mx, int my) const
         {
             corrector++;
         }
-        char buff[2] = {istSchreibbar(showChar) ? (char)showChar : text[i], 0};
-        int tmpx = tm->zCurrentRenderer()->getTextBreite(buff);
-        int tmpy = tm->zCurrentRenderer()->getZeilenHeight();
+        char buff[2] = {isWritable(showChar) ? (char)showChar : text[i], 0};
+        int tmpx = tm->zCurrentRenderer()->getTextWidth(buff);
+        int tmpy = tm->zCurrentRenderer()->getRowHeight();
         if (mx >= x && mx < x + tmpx && my >= y && my < y + tmpy)
             return i - corrector;
         if (mx < x + tmpx && my < y + tmpy) return -1;
         x += tmpx;
-        tmpy += tm->zCurrentRenderer()->getZeilenAbstand();
+        tmpy += tm->zCurrentRenderer()->getLineSpacing();
         maxLH = tmpy > maxLH ? tmpy : maxLH;
         if (text[i] == '\n')
         {
@@ -1759,20 +1759,20 @@ int TextField::getCurserPosAt(int mx, int my) const
     int thi = getTextHeight();
     int xxx = 0;
     int yyy = 0;
-    int breite = innenSize.x;
+    int Width = innenSize.x;
     int height = innenSize.y;
-    bool hs = horizontalScrollBar && hatStyle(Style::HScroll);
-    bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
+    bool hs = horizontalScrollBar && hasStyle(Style::HScroll);
+    bool vs = vertikalScrollBar && hasStyle(Style::VScroll);
     if (vs) yyy -= vertikalScrollBar->getScroll();
     if (hs) xxx -= horizontalScrollBar->getScroll();
-    if (hatStyle(Style::HCenter) && !hs) xxx = (breite / 2) - tbr / 2;
-    if (hatStyle(Style::VCenter) && !vs) yyy = (height / 2) - thi / 2;
+    if (hasStyle(Style::HCenter) && !hs) xxx = (Width / 2) - tbr / 2;
+    if (hasStyle(Style::VCenter) && !vs) yyy = (height / 2) - thi / 2;
     int x = xxx;
     int y = yyy;
     int len = tm->text->getLength();
     const char* text = tm->text->getText();
     Text txtWithLineBreaks;
-    if (hatStyle(Style::AutoLineBreak))
+    if (hasStyle(Style::AutoLineBreak))
     {
         txtWithLineBreaks = addLineBreaksToText(tm->text->getText(),
             autoLineBreakSpacing ? autoLineBreakSpacing->getText() : "");
@@ -1790,19 +1790,19 @@ int TextField::getCurserPosAt(int mx, int my) const
             corrector++;
         }
         int tmpx = tm->zCurrentRenderer()->getCharWidth(
-            istSchreibbar(showChar) ? showChar : text[i]);
-        int tmpy = tm->zCurrentRenderer()->getZeilenHeight()
-                 + tm->zCurrentRenderer()->getZeilenAbstand();
+            isWritable(showChar) ? showChar : text[i]);
+        int tmpy = tm->zCurrentRenderer()->getRowHeight()
+                 + tm->zCurrentRenderer()->getLineSpacing();
         if (mx < x + tmpx / 2
-            && my < y + tmpy - tm->zCurrentRenderer()->getZeilenAbstand() / 2)
+            && my < y + tmpy - tm->zCurrentRenderer()->getLineSpacing() / 2)
             return i - corrector;
-        x += tmpx + tm->zCurrentRenderer()->getZeichenAbstand();
+        x += tmpx + tm->zCurrentRenderer()->getCharSpacing();
         maxLH = tmpy > maxLH ? tmpy : maxLH;
         if (text[i] == '\n')
         {
-            if (my >= y - tm->zCurrentRenderer()->getZeilenAbstand() / 2
+            if (my >= y - tm->zCurrentRenderer()->getLineSpacing() / 2
                 && my < y + maxLH
-                            - tm->zCurrentRenderer()->getZeilenAbstand() / 2)
+                            - tm->zCurrentRenderer()->getLineSpacing() / 2)
                 return i - corrector;
             x = xxx;
             y += maxLH;
@@ -1826,7 +1826,7 @@ Text TextField::getAutoLineBreakSpacing() const
     return autoLineBreakSpacing ? *autoLineBreakSpacing : Text("");
 }
 
-Drawable* TextField::dublizieren() const // Creates a copy of the drawing
+Drawable* TextField::duplicate() const // Creates a copy of the drawing
 {
     TextField* obj = new TextField();
     obj->setPosition(pos);
@@ -1835,38 +1835,38 @@ Drawable* TextField::dublizieren() const // Creates a copy of the drawing
     obj->setKeyboardEventParameter(takParam);
     obj->setMouseEvent(mak);
     obj->setKeyboardEvent(tak);
-    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->duplicate());
     obj->setStyle(style);
     obj->tm->renderer->release();
     obj->tm->renderer
         = dynamic_cast<RCArray<TextRenderer>*>(tm->renderer->getThis());
-    obj->tm->textStyle.leeren();
+    obj->tm->textStyle.clear();
     for (const auto& i : tm->textStyle)
         obj->tm->textStyle.add(i);
     obj->tm->index = tm->index;
     obj->tm->styleIndex = tm->styleIndex;
     obj->tm->current = tm->current;
     if (tm->text) obj->setText(tm->text->getText());
-    obj->setHintergrundFarbe(hintergrundFarbe);
-    if (hintergrundFeld)
-        obj->setAlphaFieldZ((AlphaField*)hintergrundFeld->dublizieren());
-    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
-    if (hintergrundImage)
-        obj->setHintergrundImage(
-            dynamic_cast<Image*>(hintergrundImage->getThis()));
+    obj->setBackgroundColor(backgroundColor);
+    if (backgroundFeld)
+        obj->setAlphaFieldZ((AlphaField*)backgroundFeld->duplicate());
+    if (border) obj->setBorderZ((Border*)border->duplicate());
+    if (backgroundImage)
+        obj->setBackgroundImage(
+            dynamic_cast<Image*>(backgroundImage->getThis()));
     if (vertikalScrollBar)
     {
-        obj->setVertikalKlickScroll(vertikalScrollBar->getKlickScroll());
-        obj->setVertikalScrollPos(vertikalScrollBar->getScroll());
-        obj->setVertikalScrollFarbe(
-            vertikalScrollBar->getFarbe(), vertikalScrollBar->getBgFarbe());
+        obj->setVerticalClickScroll(vertikalScrollBar->getClickScroll());
+        obj->setVerticalScrollPos(vertikalScrollBar->getScroll());
+        obj->setVerticalScrollColor(
+            vertikalScrollBar->getColor(), vertikalScrollBar->getBgColor());
     }
     if (horizontalScrollBar)
     {
-        obj->setHorizontalKlickScroll(horizontalScrollBar->getKlickScroll());
+        obj->setHorizontalClickScroll(horizontalScrollBar->getClickScroll());
         obj->setHorizontalScrollPos(horizontalScrollBar->getScroll());
-        obj->setHorizontalScrollFarbe(
-            horizontalScrollBar->getFarbe(), horizontalScrollBar->getBgFarbe());
+        obj->setHorizontalScrollColor(
+            horizontalScrollBar->getColor(), horizontalScrollBar->getBgColor());
     }
     if (autoLineBreakSpacing)
     {

TextField.h

@@ -100,17 +100,17 @@ namespace Framework
 
             //! Combines the flags HCenter and VCenter
             static const __int64 Center = HCenter | VCenter;
-            //! Combines the flags Sichtbar, Erlaubt, Border,
+            //! Combines the flags Visible, Allowed, Border,
             //! Buffered, VCenter
             static const __int64 TextField
-                = Sichtbar | Erlaubt | Border | Buffered | VCenter | Editierbar;
-            //! Combines the flags Sichtbar,
+                = Visible | Allowed | Border | Buffered | VCenter | Editierbar;
+            //! Combines the flags Visible,
             //! Mehrzeilig
-            static const __int64 Text = Sichtbar | Mehrzeilig | Erlaubt;
-            //! Combines the flags Sichtbar, Erlaubt, Border,
-            //! Hintergrund, Mehrzeilig, VScroll
-            static const __int64 TextGebiet = Sichtbar | Erlaubt | Border
-                                            | Hintergrund | Editierbar
+            static const __int64 Text = Visible | Mehrzeilig | Allowed;
+            //! Combines the flags Visible, Allowed, Border,
+            //! Background, Mehrzeilig, VScroll
+            static const __int64 TextGebiet = Visible | Allowed | Border
+                                            | Background | Editierbar
                                             | Mehrzeilig | VScroll;
             //! Combines the flags VScroll and HScroll
             static const __int64 Scroll = VScroll | HScroll;
@@ -122,7 +122,7 @@ namespace Framework
         unsigned char showChar;
         int cpos;
         double tickVal;
-        bool mausKlick;
+        bool mouseKlick;
         std::function<void(int, int, MouseEvent me)> charEvent;
 
         int getTextHeight() const;
@@ -139,7 +139,7 @@ namespace Framework
         DLLEXPORT virtual ~TextField();
         //! charEvent: a function called when the mouse is on a specific
         //! character and the interactParam in the style is != 0
-        //! \param charEvent charEvent( charIndex, interactParam, mausEreignis );
+        //! \param charEvent charEvent( charIndex, interactParam, mouseEreignis );
         DLLEXPORT void setCharEvent(
             std::function<void(int, int, MouseEvent me)> charEvent);
         //! Sets a pointer to the text in the text field
@@ -191,39 +191,39 @@ namespace Framework
         DLLEXPORT void setTextStyle(int begin, int end, TextStyle style);
         //! Appends a line to the text
         //! \param zeile The new line
-        DLLEXPORT void addZeile(const char* zeile);
+        DLLEXPORT void addRow(const char* zeile);
         //! Appends a line to the text
         //! \param zeile The new line
         //! \param color The color of the line
-        DLLEXPORT void addZeile(const char* zeile, int color);
+        DLLEXPORT void addRow(const char* zeile, int color);
         //! Deselects all text sections
-        DLLEXPORT void deselectAuswahl();
+        DLLEXPORT void deselectSelahl();
         //! Sets the selected text section
         //!  pos1: The cursor position in the text
         //!  pos2: The position in the text up to which the text should be
         //!  colored
-        DLLEXPORT void setAuswahl(int pos1, int pos2);
+        DLLEXPORT void setSelection(int pos1, int pos2);
         //! Sets the selected text section
-        //! \param auswahl A point with x as cursor position and y as the
+        //! \param selection A point with x as cursor position and y as the
         //! position up to which the text should be colored
-        DLLEXPORT void setAuswahl(Punkt& auswahl);
+        DLLEXPORT void setSelection(Point& selection);
         //! Sets the selected text section
         //!  pos1: The cursor position in the text
         //!  pos2: The position in the text up to which the text should be
         //!  colored
-        DLLEXPORT void addAuswahl(int pos1, int pos2);
+        DLLEXPORT void addSelahl(int pos1, int pos2);
         //! Sets the selected text section
-        //! \param auswahl A point with x as cursor position and y as the
+        //! \param selection A point with x as cursor position and y as the
         //! position up to which the text should be colored
-        DLLEXPORT void addAuswahl(Punkt& auswahl);
+        DLLEXPORT void addSelahl(Point& selection);
         //! Sets the selected text section
         //! \param begin The cursor position in the text
         //! \param end The position in the text up to which the text should be
         //! colored
-        DLLEXPORT void invertAuswahl(int begin, int end);
+        DLLEXPORT void invertSelection(int begin, int end);
         //! Replaces all selected text sections with a text
         //! \param text The new text
-        DLLEXPORT void replaceAuswahl(const char* text);
+        DLLEXPORT void replaceSelection(const char* text);
         //! Sets the TextRenderer to use
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
@@ -234,28 +234,28 @@ namespace Framework
         //! \param textRd The text renderers
         DLLEXPORT void setTextRendererZ(RCArray<TextRenderer>* textRd);
         //! Sets a pointer to the font
-        //! \param schrift The font to use for text drawing.
-        DLLEXPORT void setFontZ(Font* schrift);
+        //! \param font The font to use for text drawing.
+        DLLEXPORT void setFontZ(Font* font);
         //! Sets a pointer to the font
         //! \param rendererIndex The index of the renderer whose font should
-        //! be set \param schrift The font to use for text drawing.
-        DLLEXPORT void setFontZ(int rendererIndex, Font* schrift);
+        //! be set \param font The font to use for text drawing.
+        DLLEXPORT void setFontZ(int rendererIndex, Font* font);
         //! Sets the font size (default: 12)
         //! \param gr The font size to use for text drawing
-        DLLEXPORT void setSchriftSize(unsigned char gr);
+        DLLEXPORT void setFontSize(unsigned char gr);
         //! Sets the font size (default: 12)
         //! \param begin The index of the first affected character
         //! \param end The index of the first unaffected character
         //! \param gr The font size to use for text drawing
-        DLLEXPORT void setSchriftSize(int begin, int end, unsigned char gr);
+        DLLEXPORT void setFontSize(int begin, int end, unsigned char gr);
         //! Sets the font color
         //! \param fc The color to use for text drawing
-        DLLEXPORT void setSchriftFarbe(int fc);
+        DLLEXPORT void setFontColor(int fc);
         //! Sets the font color
         //! \param begin The index of the first affected character
         //! \param end The index of the first unaffected character
         //! \param fc The color to use for text drawing
-        DLLEXPORT void setSchriftFarbe(int begin, int end, int fc);
+        DLLEXPORT void setFontColor(int begin, int end, int fc);
         //! Sets a character to use for drawing, regardless of the text
         //! field's text (requires drawing flag: Border)
         //! \param c The character to draw
@@ -263,13 +263,13 @@ namespace Framework
         DLLEXPORT void setSchowChar(unsigned char c);
         //! Scrolls to a specific line (requires drawing flag: VScroll)
         //! \param zeile The index of the line that should be the top visible line
-        DLLEXPORT void setVScrollZuZeile(int zeile);
-        //! Scrolls to a specific position in the text. Without the Erlaubt
+        DLLEXPORT void setVScrollToRow(int zeile);
+        //! Scrolls to a specific position in the text. Without the Allowed
         //! flag, always scrolls to the bottom. (requires drawing flag:
         //! VScroll) \param pos The index of the character to scroll to.
         //! By default scrolls to the cursor position
         DLLEXPORT void updateVScroll(int pos = -1);
-        //! Scrolls to a specific position in the text. Requires the Erlaubt
+        //! Scrolls to a specific position in the text. Requires the Allowed
         //! flag. (requires drawing flag: HScroll) \param pos The index of
         //! the character to scroll to. By default scrolls to the cursor position
         DLLEXPORT void updateHScroll(int pos = -1);
@@ -324,15 +324,15 @@ namespace Framework
         //! \return 0 if the TextRenderer was not set
         DLLEXPORT TextRenderer* zTextRenderer(int index) const;
         //! Returns the font size
-        DLLEXPORT unsigned char getSchriftSize() const;
+        DLLEXPORT unsigned char getFontSize() const;
         //! Returns the font size
         //! \param index The index of the character
-        DLLEXPORT unsigned char getSchriftSize(int index) const;
+        DLLEXPORT unsigned char getFontSize(int index) const;
         //! Returns the font color in A8R8G8B8 format
-        DLLEXPORT int getSchriftFarbe() const;
+        DLLEXPORT int getFontColor() const;
         //! Returns the font color in A8R8G8B8 format
         //! \param index The index of the character
-        DLLEXPORT int getSchriftFarbe(int index) const;
+        DLLEXPORT int getFontColor(int index) const;
         //! Returns the display character
         DLLEXPORT unsigned char getShowChar() const;
         //! Returns the cursor position
@@ -358,6 +358,6 @@ namespace Framework
         DLLEXPORT Text getAutoLineBreakSpacing() const;
         //! Creates a complete copy of the text field that can be modified
         //! without affecting the original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 } // namespace Framework

Texture.cpp

@@ -16,7 +16,7 @@ Texture::Texture()
     : ReferenceCounter()
 {
     bild = 0;
-    lastGr = Punkt(0, 0);
+    lastGr = Point(0, 0);
     id = -1;
     changed = 0;
 }
@@ -42,13 +42,13 @@ void Texture::setImage(Image* b)
 {
     if (!b) return;
     if (bild != b) changed = 1;
-    if (!bild || bild->getBreite() != b->getBreite()
+    if (!bild || bild->getWidth() != b->getWidth()
         || bild->getHeight() != b->getHeight())
     {
         if (!bild) bild = new Image();
-        bild->neuImage(b->getBreite(), b->getHeight(), 0);
+        bild->newImage(b->getWidth(), b->getHeight(), 0);
     }
-    bild->drawImage(0, 0, bild->getBreite(), bild->getHeight(), *b);
+    bild->drawImage(0, 0, bild->getWidth(), bild->getHeight(), *b);
     b->release();
 }
 
@@ -79,7 +79,7 @@ bool DX9Texture::updateTextur()
 }
 
 // Returns true if updateTextur needs to be called
-bool DX9Texture::brauchtUpdate() const
+bool DX9Texture::needsUpdate() const
 {
     return 0;
 }
@@ -115,7 +115,7 @@ bool DX11Texture::updateTextur()
         D3D11_TEXTURE2D_DESC bufferDesc;
         memset(&bufferDesc, 0, sizeof(D3D11_TEXTURE2D_DESC));
         bufferDesc.ArraySize = 1;
-        bufferDesc.Width = bild->getBreite();
+        bufferDesc.Width = bild->getWidth();
         bufferDesc.Height = bild->getHeight();
         bufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
         bufferDesc.BindFlags
@@ -131,7 +131,7 @@ bool DX11Texture::updateTextur()
         HRESULT r = device->CreateTexture2D(&bufferDesc, 0, &txt);
         if (r != S_OK) return 0;
     }
-    if (!renderTarget && (bild->getRend() || changed))
+    if (!renderTarget && (bild->getNeedRender() || changed))
     {
         changed = 0;
         if (useMips)
@@ -140,8 +140,8 @@ bool DX11Texture::updateTextur()
                 0,
                 0,
                 bild->getBuffer(),
-                4 * bild->getBreite(),
-                4 * bild->getBreite() * bild->getHeight());
+                4 * bild->getWidth(),
+                4 * bild->getWidth() * bild->getHeight());
         }
         else
         {
@@ -149,9 +149,9 @@ bool DX11Texture::updateTextur()
             context->Map(
                 txt, 0, D3D11_MAP::D3D11_MAP_WRITE_DISCARD, 0, &buffer);
             int* bgBuff = bild->getBuffer();
-            int tmpBr = 4 * bild->getBreite();
+            int tmpBr = 4 * bild->getWidth();
             for (int y = 0, pitch = 0, bry = 0; y < bild->getHeight();
-                ++y, pitch += buffer.RowPitch, bry += bild->getBreite())
+                ++y, pitch += buffer.RowPitch, bry += bild->getWidth())
                 memcpy(&((BYTE*)buffer.pData)[pitch],
                     (void*)&(bgBuff[bry]),
                     tmpBr);
@@ -177,7 +177,7 @@ bool DX11Texture::updateTextur()
 }
 
 // Returns true if updateTextur needs to be called
-bool DX11Texture::brauchtUpdate() const
+bool DX11Texture::needsUpdate() const
 {
     return !view;
 }
@@ -214,7 +214,7 @@ void DX11Texture::copyToImage(Image* zB)
     D3D11_TEXTURE2D_DESC tempBufferDesc;
     memset(&tempBufferDesc, 0, sizeof(D3D11_TEXTURE2D_DESC));
     tempBufferDesc.ArraySize = 1;
-    tempBufferDesc.Width = bild->getBreite();
+    tempBufferDesc.Width = bild->getWidth();
     tempBufferDesc.Height = bild->getHeight();
     tempBufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
     tempBufferDesc.BindFlags = 0;
@@ -226,16 +226,16 @@ void DX11Texture::copyToImage(Image* zB)
     HRESULT r = device->CreateTexture2D(&tempBufferDesc, 0, &tmpTxt);
     if (r != S_OK) throw "could not create resource copy with cpu read access";
     context->CopyResource(tmpTxt, txt);
-    zB->neuImage(bild->getBreite(), bild->getHeight(), 0);
+    zB->newImage(bild->getWidth(), bild->getHeight(), 0);
     D3D11_MAPPED_SUBRESOURCE buffer;
     r = context->Map(tmpTxt, 0, D3D11_MAP::D3D11_MAP_READ, 0, &buffer);
     if (r != S_OK) throw "could not access recource copy";
     int* bgBuff = zB->getBuffer();
-    int tmpBr = 4 * zB->getBreite();
+    int tmpBr = 4 * zB->getWidth();
     for (int y = 0, pitch = 0, bry = 0; y < zB->getHeight();
-        ++y, pitch += buffer.RowPitch, bry += zB->getBreite())
+        ++y, pitch += buffer.RowPitch, bry += zB->getWidth())
         memcpy((void*)&(bgBuff[bry]), &((BYTE*)buffer.pData)[pitch], tmpBr);
-    for (int i = 0; i < zB->getBreite() * zB->getHeight(); i++)
+    for (int i = 0; i < zB->getWidth() * zB->getHeight(); i++)
     {
         if (bgBuff[i]) bgBuff[i] |= 0xFF000000;
     }

Texture.h

@@ -23,7 +23,7 @@ namespace Framework
     protected:
         Image* bild;
         bool changed;
-        Punkt lastGr;
+        Point lastGr;
         int id;
 
     public:
@@ -41,7 +41,7 @@ namespace Framework
         //! to graphics memory
         DLLEXPORT virtual bool updateTextur() = 0;
         //! Returns true if updateTextur needs to be called
-        DLLEXPORT virtual bool brauchtUpdate() const = 0;
+        DLLEXPORT virtual bool needsUpdate() const = 0;
         //! Returns a pointer to the image
         DLLEXPORT Image* getImage() const;
         //! Returns a pointer to the image without increased reference counter
@@ -62,7 +62,7 @@ namespace Framework
         //! to graphics memory
         DLLEXPORT virtual bool updateTextur() override;
         //! Returns true if updateTextur needs to be called
-        DLLEXPORT virtual bool brauchtUpdate() const override;
+        DLLEXPORT virtual bool needsUpdate() const override;
     };
 
     class DX11Texture : public Texture
@@ -83,7 +83,7 @@ namespace Framework
         //! to graphics memory
         DLLEXPORT bool updateTextur() override;
         //! Returns true if updateTextur needs to be called
-        DLLEXPORT bool brauchtUpdate() const override;
+        DLLEXPORT bool needsUpdate() const override;
         //! Returns the used shader resource view
         DLLEXPORT operator ID3D11ShaderResourceView*() const;
         //! Returns the used texture

Texture2D.cpp

@@ -99,10 +99,10 @@ bool Texture2D::tick(double t)
         if (a->ausgleich >= 1.0 / a->data->getFPS())
         {
             a->ausgleich -= 1.0 / a->data->getFPS();
-            if (++(a->jetzt) >= a->data->getImageAnzahl())
+            if (++(a->jetzt) >= a->data->getImageCount())
             {
                 a->jetzt = 0;
-                if (!a->data->istWiederhohlend()) nextAnimation();
+                if (!a->data->isRepeating()) nextAnimation();
             }
         }
         a->data->unlock();

TextureList.cpp

@@ -25,11 +25,11 @@ TextureList::~TextureList()
 }
 
 // Deletes all textures
-__declspec(dllexport) void TextureList::leeren()
+__declspec(dllexport) void TextureList::clear()
 {
     cs.lock();
-    textures->leeren();
-    names->leeren();
+    textures->clear();
+    names->clear();
     cs.unlock();
 }
 
@@ -41,7 +41,7 @@ bool TextureList::addTexture(Texture* t, const char* name)
     cs.lock();
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             t->release();
             cs.unlock();
@@ -63,7 +63,7 @@ void TextureList::removeTexture(const char* name)
     int index = 0;
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             names->remove(index);
             textures->remove(index);
@@ -83,7 +83,7 @@ bool TextureList::hasTexture(const char* name) const
     cs.lock();
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             cs.unlock();
             return 1;
@@ -101,7 +101,7 @@ Texture* TextureList::getTexture(const char* name) const
     int index = 0;
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             cs.unlock();
             return textures->get(index);
@@ -137,7 +137,7 @@ Texture* TextureList::zTexture(const char* name) const
     int index = 0;
     for (auto i : *names)
     {
-        if (i->istGleich(name))
+        if (i->isEqual(name))
         {
             cs.unlock();
             return textures->z(index);

TextureList.h

@@ -23,7 +23,7 @@ namespace Framework
         //! Destructor
         ~TextureList();
         //! Deletes all textures
-        DLLEXPORT void leeren();
+        DLLEXPORT void clear();
         //! Adds a texture to the list
         //! \param t The texture
         //! \param name The name under which the texture is stored in the list

Thread.cpp

@@ -28,7 +28,7 @@ Thread::~Thread()
 #else
     if (pthread_self() == threadHandle) return;
 #endif
-    if (run) warteAufThread(100000);
+    if (run) waitForThread(100000);
     if (run) ende();
 }
 
@@ -53,7 +53,7 @@ void Thread::pause() // pauses the thread
     run = 0;
 }
 
-void Thread::fortsetzen() // resumes the thread
+void Thread::resume() // resumes the thread
 {
     if (!run) ResumeThread(threadHandle);
     run = 1;
@@ -102,7 +102,7 @@ bool Thread::isRunning() const // checks if the thread is active
     return run;
 }
 
-int Thread::warteAufThread(int zeit) // waits for the thread for the given time
+int Thread::waitForThread(int zeit) // waits for the thread for the given time
 {
 #ifdef WIN32
     if (!run) return WAIT_OBJECT_0;
@@ -165,7 +165,7 @@ void Thread::removeCriticalLock()
 #ifdef WIN32
 unsigned long __stdcall Framework::threadStart(void* param)
 {
-    if (istThreadOk((Thread*)param))
+    if (isThreadOk((Thread*)param))
     {
         const char* name = ((Thread*)param)->getName();
         wchar_t* wc = new wchar_t[textLength(name) + 1];
@@ -175,7 +175,7 @@ unsigned long __stdcall Framework::threadStart(void* param)
         delete[] wc;
         ((Thread*)param)->thread();
     }
-    if (istThreadOk((Thread*)param)) ((Thread*)param)->threadEnd();
+    if (isThreadOk((Thread*)param)) ((Thread*)param)->threadEnd();
     return 0;
 }
 #else
@@ -183,14 +183,14 @@ void* Framework::threadStart(void* param)
 {
     pthread_t handle = 0;
     pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
-    if (istThreadOk((Thread*)param))
+    if (isThreadOk((Thread*)param))
     {
         pthread_setname_np(
             ((Thread*)param)->getThreadHandle(), ((Thread*)param)->getName());
         ((Thread*)param)->setSystemHandlePointer(&handle);
         ((Thread*)param)->thread();
     }
-    if (istThreadOk((Thread*)param)) ((Thread*)param)->threadEnd();
+    if (isThreadOk((Thread*)param)) ((Thread*)param)->threadEnd();
     thRegister->addClosedThread(handle);
     pthread_exit(0);
     return 0;
@@ -207,7 +207,7 @@ ThreadRegister::ThreadRegister()
 ThreadRegister::~ThreadRegister()
 {
     EnterCriticalSection(&cs);
-    while (threads.hat(0))
+    while (threads.has(0))
     {
         LeaveCriticalSection(&cs);
         Sleep(1000); // wait until all threads are done
@@ -229,14 +229,14 @@ void ThreadRegister::add(Thread* t)
 void ThreadRegister::remove(Thread* t)
 {
     EnterCriticalSection(&cs);
-    threads.remove(threads.getWertIndex(t));
+    threads.remove(threads.getValueIndex(t));
     LeaveCriticalSection(&cs);
 }
 
 bool ThreadRegister::isThread(Thread* t)
 {
     EnterCriticalSection(&cs);
-    bool ret = threads.hat(threads.getWertIndex(t));
+    bool ret = threads.has(threads.getValueIndex(t));
     LeaveCriticalSection(&cs);
     return ret;
 }

Thread.h

@@ -35,7 +35,7 @@ namespace Framework
         //! Pauses the thread (Windows only)
         DLLEXPORT void pause();
         //! Resumes the thread (Windows only)
-        DLLEXPORT void fortsetzen();
+        DLLEXPORT void resume();
 #endif
         //! Terminates the thread
         DLLEXPORT void ende();
@@ -50,7 +50,7 @@ namespace Framework
         DLLEXPORT bool isRunning() const;
         //! Waits for the thread for the specified time
         //! \param zeit The time to wait for the thread. 1000 = 1 second
-        DLLEXPORT int warteAufThread(int zeit);
+        DLLEXPORT int waitForThread(int zeit);
         //! Sets a framework pointer to a thread handle that will be set to 0
         //! if the thread resources have already been fully cleaned up
         //! \param ths A pointer to a thread handle to be modified

Time.cpp

@@ -237,7 +237,7 @@ int Clock::plusClock(const char* format, Text* zeit)
     return ret;
 }
 
-int Clock::plusStunde(__int64 stunde) // adds stunde hours
+int Clock::plusHour(__int64 stunde) // adds stunde hours
 {
     this->stunde += stunde;
     return update();
@@ -249,7 +249,7 @@ int Clock::plusMinute(__int64 minute) // adds minute minutes
     return update();
 }
 
-int Clock::plusSekunde(__int64 sekunde) // adds sekunde seconds
+int Clock::plusSecond(__int64 sekunde) // adds sekunde seconds
 {
     this->sekunde += sekunde;
     return update();
@@ -310,7 +310,7 @@ int Clock::minusClock(const char* format, Text* zeit)
     return ret;
 }
 
-int Clock::minusStunde(__int64 stunde) // subtracts stunde hours
+int Clock::minusHour(__int64 stunde) // subtracts stunde hours
 {
     this->stunde -= stunde;
     return update();
@@ -322,7 +322,7 @@ int Clock::minusMinute(__int64 minute) // subtracts minute minutes
     return update();
 }
 
-int Clock::minusSekunde(__int64 sekunde) // subtracts sekunde seconds
+int Clock::minusSecond(__int64 sekunde) // subtracts sekunde seconds
 {
     this->sekunde -= sekunde;
     return update();
@@ -370,7 +370,7 @@ const char* format) const // returns the time formatted as text
     return ret;
 }
 
-bool Clock::istGleich(
+bool Clock::isEqual(
 Clock* zeit) const // checks if the time equals zeit
 {
     bool ret = stunde == zeit->getStunde() && minute == zeit->getMinute()
@@ -379,7 +379,7 @@ Clock* zeit) const // checks if the time equals zeit
     return ret;
 }
 
-bool Clock::istGleich(const char* format, const char* zeit) const
+bool Clock::isEqual(const char* format, const char* zeit) const
 {
     int st = (int)stunde, min = (int)minute, sek = (int)sekunde;
     int flen = textLength(format);
@@ -412,47 +412,47 @@ bool Clock::istGleich(const char* format, const char* zeit) const
     return ret;
 }
 
-bool Clock::istGleich(const char* format, Text* zeit) const
+bool Clock::isEqual(const char* format, Text* zeit) const
 {
-    bool ret = istGleich(format, zeit->getText());
+    bool ret = isEqual(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-bool Clock::istGleich(int stunde, int minute, int sekunde) const
+bool Clock::isEqual(int stunde, int minute, int sekunde) const
 {
     return this->stunde == stunde && this->minute == minute
         && this->sekunde == sekunde;
 }
 
-bool Clock::stundeGleich(
+bool Clock::hourEqual(
 int stunde) const // checks if the hour equals stunde
 {
     return this->stunde == stunde;
 }
 
-bool Clock::minuteGleich(
+bool Clock::minuteEqual(
 int minute) const // checks if the minute equals minute
 {
     return this->minute == minute;
 }
 
-bool Clock::sekundeGleich(
+bool Clock::secondEqual(
 int sekunde) const // checks if the second equals sekunde
 {
     return this->sekunde == sekunde;
 }
 
-bool Clock::istKleiner(
+bool Clock::isSmaller(
 Clock* zeit) const // checks if the time is less than zeit
 {
     bool ret
-        = istKleiner(zeit->getStunde(), zeit->getMinute(), zeit->getSekunde());
+        = isSmaller(zeit->getStunde(), zeit->getMinute(), zeit->getSekunde());
     zeit->release();
     return ret;
 }
 
-bool Clock::istKleiner(int stunde, int minute, int sekunde) const
+bool Clock::isSmaller(int stunde, int minute, int sekunde) const
 {
     if (this->stunde < stunde)
         return 1;
@@ -476,7 +476,7 @@ bool Clock::istKleiner(int stunde, int minute, int sekunde) const
         return 0;
 }
 
-bool Clock::istKleiner(const char* format, const char* zeit) const
+bool Clock::isSmaller(const char* format, const char* zeit) const
 {
     int st = (int)stunde, min = (int)minute, sek = (int)sekunde;
     int flen = textLength(format);
@@ -505,26 +505,26 @@ bool Clock::istKleiner(const char* format, const char* zeit) const
             break;
         }
     }
-    return istKleiner(st, min, sek);
+    return isSmaller(st, min, sek);
 }
 
-bool Clock::istKleiner(const char* format, Text* zeit) const
+bool Clock::isSmaller(const char* format, Text* zeit) const
 {
-    bool ret = istKleiner(format, zeit->getText());
+    bool ret = isSmaller(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-bool Clock::istLater(
+bool Clock::isLater(
 Clock* zeit) const // checks if the time is greater than zeit
 {
     bool ret
-        = istLater(zeit->getStunde(), zeit->getMinute(), zeit->getSekunde());
+        = isLater(zeit->getStunde(), zeit->getMinute(), zeit->getSekunde());
     zeit->release();
     return ret;
 }
 
-bool Clock::istLater(int stunde, int minute, int sekunde) const
+bool Clock::isLater(int stunde, int minute, int sekunde) const
 {
     if (this->stunde > stunde)
         return 1;
@@ -548,7 +548,7 @@ bool Clock::istLater(int stunde, int minute, int sekunde) const
         return 0;
 }
 
-bool Clock::istLater(const char* format, const char* zeit) const
+bool Clock::isLater(const char* format, const char* zeit) const
 {
     int st = (int)stunde, min = (int)minute, sek = (int)sekunde;
     int flen = textLength(format);
@@ -577,12 +577,12 @@ bool Clock::istLater(const char* format, const char* zeit) const
             break;
         }
     }
-    return istLater(st, min, sek);
+    return isLater(st, min, sek);
 }
 
-bool Clock::istLater(const char* format, Text* zeit) const
+bool Clock::isLater(const char* format, Text* zeit) const
 {
-    bool ret = istLater(format, zeit->getText());
+    bool ret = isLater(format, zeit->getText());
     zeit->release();
     return ret;
 }
@@ -601,7 +601,7 @@ void Date::update() // calculates the new date
         monat += 12;
         --jahr;
     }
-    if (istSchaltjahr(jahr))
+    if (isLeapYear(jahr))
         maxTage[1] = 29;
     else
         maxTage[1] = 28;
@@ -613,7 +613,7 @@ void Date::update() // calculates the new date
         {
             monat -= 12;
             ++jahr;
-            if (istSchaltjahr(jahr))
+            if (isLeapYear(jahr))
                 maxTage[1] = 29;
             else
                 maxTage[1] = 28;
@@ -627,7 +627,7 @@ void Date::update() // calculates the new date
         {
             monat += 12;
             --jahr;
-            if (istSchaltjahr(jahr))
+            if (isLeapYear(jahr))
                 maxTage[1] = 29;
             else
                 maxTage[1] = 28;
@@ -782,19 +782,19 @@ void Date::plusDate(const char* format, Text* datum)
     datum->release();
 }
 
-void Date::plusJahr(int jahr) // adds jahr years
+void Date::plusYear(int jahr) // adds jahr years
 {
     this->jahr += jahr;
     update();
 }
 
-void Date::plusMonat(int monat) // adds monat months
+void Date::plusMonth(int monat) // adds monat months
 {
     this->monat = monat;
     update();
 }
 
-void Date::plusTag(int tag) // adds tag days
+void Date::plusDay(int tag) // adds tag days
 {
     this->tag += tag;
     update();
@@ -854,19 +854,19 @@ void Date::minusDate(const char* format, Text* datum)
     datum->release();
 }
 
-void Date::minusJahr(int jahr) // subtracts jahr years
+void Date::minusYear(int jahr) // subtracts jahr years
 {
     this->jahr -= jahr;
     update();
 }
 
-void Date::minusMonat(int monat) // subtracts monat months
+void Date::minusMonth(int monat) // subtracts monat months
 {
     this->monat -= monat;
     update();
 }
 
-void Date::minusTag(int tag) // subtracts tag days
+void Date::minusDay(int tag) // subtracts tag days
 {
     this->tag -= tag;
     update();
@@ -914,7 +914,7 @@ const char* format) const // returns the date formatted as text
     return ret;
 }
 
-bool Date::istGleich(
+bool Date::isEqual(
 Date* datum) const // checks if the date equals datum
 {
     bool ret = jahr == datum->getJahr() && monat == datum->getMonat()
@@ -923,7 +923,7 @@ Date* datum) const // checks if the date equals datum
     return ret;
 }
 
-bool Date::istGleich(const char* format, const char* datum) const
+bool Date::isEqual(const char* format, const char* datum) const
 {
     int j = jahr, m = monat, t = tag;
     int flen = textLength(format);
@@ -956,43 +956,43 @@ bool Date::istGleich(const char* format, const char* datum) const
     return ret;
 }
 
-bool Date::istGleich(const char* format, Text* datum) const
+bool Date::isEqual(const char* format, Text* datum) const
 {
-    bool ret = istGleich(format, datum->getText());
+    bool ret = isEqual(format, datum->getText());
     datum->release();
     return ret;
 }
 
-bool Date::istGleich(int jahr, int monat, int tag) const
+bool Date::isEqual(int jahr, int monat, int tag) const
 {
     return this->jahr == jahr && this->monat == monat && this->tag == tag;
 }
 
-bool Date::jahrGleich(int jahr) const // checks if the year equals jahr
+bool Date::yearEqual(int jahr) const // checks if the year equals jahr
 {
     return this->jahr == jahr;
 }
 
-bool Date::monatGleich(
+bool Date::monthEqual(
 int monat) const // checks if the month equals monat
 {
     return this->monat == monat;
 }
 
-bool Date::tagGleich(int tag) const // checks if the day equals tag
+bool Date::dayEqual(int tag) const // checks if the day equals tag
 {
     return this->tag == tag;
 }
 
-bool Date::istKleiner(
+bool Date::isSmaller(
 Date* datum) const // checks if the date is less than datum
 {
-    bool ret = istKleiner(datum->getJahr(), datum->getMonat(), datum->getTag());
+    bool ret = isSmaller(datum->getJahr(), datum->getMonat(), datum->getTag());
     datum->release();
     return ret;
 }
 
-bool Date::istKleiner(int jahr, int monat, int tag) const
+bool Date::isSmaller(int jahr, int monat, int tag) const
 {
     if (this->jahr < jahr)
         return 1;
@@ -1016,7 +1016,7 @@ bool Date::istKleiner(int jahr, int monat, int tag) const
         return 0;
 }
 
-bool Date::istKleiner(const char* format, const char* datum) const
+bool Date::isSmaller(const char* format, const char* datum) const
 {
     int j = jahr, m = monat, t = tag;
     int flen = textLength(format);
@@ -1045,25 +1045,25 @@ bool Date::istKleiner(const char* format, const char* datum) const
             break;
         }
     }
-    return istKleiner(j, m, t);
+    return isSmaller(j, m, t);
 }
 
-bool Date::istKleiner(const char* format, Text* datum) const
+bool Date::isSmaller(const char* format, Text* datum) const
 {
-    bool ret = istKleiner(format, datum->getText());
+    bool ret = isSmaller(format, datum->getText());
     datum->release();
     return ret;
 }
 
-bool Date::istLater(
+bool Date::isLater(
 Date* datum) const // checks if the date is greater than datum
 {
-    bool ret = istLater(datum->getJahr(), datum->getMonat(), datum->getTag());
+    bool ret = isLater(datum->getJahr(), datum->getMonat(), datum->getTag());
     datum->release();
     return ret;
 }
 
-bool Date::istLater(int jahr, int monat, int tag) const
+bool Date::isLater(int jahr, int monat, int tag) const
 {
     if (this->jahr > jahr)
         return 1;
@@ -1087,7 +1087,7 @@ bool Date::istLater(int jahr, int monat, int tag) const
         return 0;
 }
 
-bool Date::istLater(const char* format, const char* datum) const
+bool Date::isLater(const char* format, const char* datum) const
 {
     int j = jahr, m = monat, t = tag;
     int flen = textLength(format);
@@ -1116,12 +1116,12 @@ bool Date::istLater(const char* format, const char* datum) const
             break;
         }
     }
-    return istLater(j, m, t);
+    return isLater(j, m, t);
 }
 
-bool Date::istLater(const char* format, Text* datum) const
+bool Date::isLater(const char* format, Text* datum) const
 {
-    bool ret = istLater(format, datum->getText());
+    bool ret = isLater(format, datum->getText());
     datum->release();
     return ret;
 }
@@ -1141,7 +1141,7 @@ Time::Time(__int64 timestamp)
       uhrzeit(new Clock())
 {
     datum->setDate(1970, 1, 1);
-    plusSekunde(timestamp);
+    plusSecond(timestamp);
 }
 
 // Destructor
@@ -1155,7 +1155,7 @@ Time::~Time()
 void Time::setTime(Time* zeit) // sets the time
 {
     datum->setDate(zeit->getDate());
-    datum->plusTag(uhrzeit->setClock(zeit->getClock()));
+    datum->plusDay(uhrzeit->setClock(zeit->getClock()));
     zeit->release();
 }
 
@@ -1163,7 +1163,7 @@ void Time::setTime(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde)
 {
     datum->setDate(jahr, monat, tag);
-    datum->plusTag(uhrzeit->setClock(stunde, minute, sekunde));
+    datum->plusDay(uhrzeit->setClock(stunde, minute, sekunde));
 }
 
 void Time::setTime(const char* format,
@@ -1219,7 +1219,7 @@ const char* zeit) // format examples: "Y:m:d H-i-s", "Y-m-d H:i:s"
         }
     }
     datum->setDate(y, m, d);
-    datum->plusTag(uhrzeit->setClock(h, i, s));
+    datum->plusDay(uhrzeit->setClock(h, i, s));
 }
 
 void Time::setTime(const char* format, Text* zeit)
@@ -1245,23 +1245,23 @@ void Time::setTag(int tag) // sets the day
 
 void Time::setStunde(int stunde) // sets the hour
 {
-    datum->plusTag(uhrzeit->setStunde(stunde));
+    datum->plusDay(uhrzeit->setStunde(stunde));
 }
 
 void Time::setMinute(int minute) // sets the minute
 {
-    datum->plusTag(uhrzeit->setMinute(minute));
+    datum->plusDay(uhrzeit->setMinute(minute));
 }
 
 void Time::setSekunde(int sekunde) // sets the second
 {
-    datum->plusTag(uhrzeit->setSekunde(sekunde));
+    datum->plusDay(uhrzeit->setSekunde(sekunde));
 }
 
 void Time::plusTime(Time* zeit) // adds the time
 {
     datum->plusDate(zeit->getDate());
-    datum->plusTag(uhrzeit->plusClock(zeit->getClock()));
+    datum->plusDay(uhrzeit->plusClock(zeit->getClock()));
     zeit->release();
 }
 
@@ -1269,7 +1269,7 @@ void Time::plusTime(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde)
 {
     datum->plusDate(jahr, monat, tag);
-    datum->plusTag(uhrzeit->plusClock(stunde, minute, sekunde));
+    datum->plusDay(uhrzeit->plusClock(stunde, minute, sekunde));
 }
 
 void Time::plusTime(const char* format, const char* zeit)
@@ -1323,7 +1323,7 @@ void Time::plusTime(const char* format, const char* zeit)
         }
     }
     datum->setDate(y, m, d);
-    datum->plusTag(uhrzeit->setClock(h, i, s));
+    datum->plusDay(uhrzeit->setClock(h, i, s));
 }
 
 void Time::plusTime(const char* format, Text* zeit)
@@ -1332,40 +1332,40 @@ void Time::plusTime(const char* format, Text* zeit)
     zeit->release();
 }
 
-void Time::plusJahr(int jahr) // adds jahr years
+void Time::plusYear(int jahr) // adds jahr years
 {
-    datum->plusJahr(jahr);
+    datum->plusYear(jahr);
 }
 
-void Time::plusMonat(int monat) // adds monat months
+void Time::plusMonth(int monat) // adds monat months
 {
-    datum->plusMonat(monat);
+    datum->plusMonth(monat);
 }
 
-void Time::plusTag(int tag) // adds tag days
+void Time::plusDay(int tag) // adds tag days
 {
-    datum->plusTag(tag);
+    datum->plusDay(tag);
 }
 
-void Time::plusStunde(__int64 stunde) // adds stunde hours
+void Time::plusHour(__int64 stunde) // adds stunde hours
 {
-    datum->plusTag(uhrzeit->plusStunde(stunde));
+    datum->plusDay(uhrzeit->plusHour(stunde));
 }
 
 void Time::plusMinute(__int64 minute) // adds minute minutes
 {
-    datum->plusTag(uhrzeit->plusMinute(minute));
+    datum->plusDay(uhrzeit->plusMinute(minute));
 }
 
-void Time::plusSekunde(__int64 sekunde) // adds sekunde seconds
+void Time::plusSecond(__int64 sekunde) // adds sekunde seconds
 {
-    datum->plusTag(uhrzeit->plusSekunde(sekunde));
+    datum->plusDay(uhrzeit->plusSecond(sekunde));
 }
 
 void Time::minusTime(Time* zeit) // subtracts the time
 {
     datum->minusDate(zeit->getDate());
-    datum->plusTag(uhrzeit->minusClock(zeit->getClock()));
+    datum->plusDay(uhrzeit->minusClock(zeit->getClock()));
     zeit->release();
 }
 
@@ -1373,7 +1373,7 @@ void Time::minusTime(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde)
 {
     datum->minusDate(jahr, monat, tag);
-    datum->plusTag(uhrzeit->plusClock(stunde, minute, sekunde));
+    datum->plusDay(uhrzeit->plusClock(stunde, minute, sekunde));
 }
 
 void Time::minusTime(const char* format, const char* zeit)
@@ -1427,7 +1427,7 @@ void Time::minusTime(const char* format, const char* zeit)
         }
     }
     datum->setDate(y, m, d);
-    datum->plusTag(uhrzeit->setClock(h, i, s));
+    datum->plusDay(uhrzeit->setClock(h, i, s));
 }
 
 void Time::minusTime(const char* format, Text* zeit)
@@ -1436,34 +1436,34 @@ void Time::minusTime(const char* format, Text* zeit)
     zeit->release();
 }
 
-void Time::minusJahr(int jahr) // subtracts jahr years
+void Time::minusYear(int jahr) // subtracts jahr years
 {
-    datum->minusJahr(jahr);
+    datum->minusYear(jahr);
 }
 
-void Time::minusMonat(int monat) // subtracts monat months
+void Time::minusMonth(int monat) // subtracts monat months
 {
-    datum->minusMonat(monat);
+    datum->minusMonth(monat);
 }
 
-void Time::minusTag(int tag) // subtracts tag days
+void Time::minusDay(int tag) // subtracts tag days
 {
-    datum->minusTag(tag);
+    datum->minusDay(tag);
 }
 
-void Time::minusStunde(__int64 stunde) // subtracts stunde hours
+void Time::minusHour(__int64 stunde) // subtracts stunde hours
 {
-    datum->plusTag(uhrzeit->minusStunde(stunde));
+    datum->plusDay(uhrzeit->minusHour(stunde));
 }
 
 void Time::minusMinute(__int64 minute) // subtracts minute minutes
 {
-    datum->plusTag(uhrzeit->minusMinute(minute));
+    datum->plusDay(uhrzeit->minusMinute(minute));
 }
 
-void Time::minusSekunde(__int64 sekunde) // subtracts sekunde seconds
+void Time::minusSecond(__int64 sekunde) // subtracts sekunde seconds
 {
-    datum->plusTag(uhrzeit->minusSekunde(sekunde));
+    datum->plusDay(uhrzeit->minusSecond(sekunde));
 }
 
 // constant
@@ -1506,15 +1506,15 @@ const char* format) const // returns the time formatted as text
     return ret;
 }
 
-bool Time::istGleich(Time* zeit) const // checks if the time equals zeit
+bool Time::isEqual(Time* zeit) const // checks if the time equals zeit
 {
-    bool ret = datum->istGleich(zeit->getDate())
-            && uhrzeit->istGleich(zeit->getClock());
+    bool ret = datum->isEqual(zeit->getDate())
+            && uhrzeit->isEqual(zeit->getClock());
     zeit->release();
     return ret;
 }
 
-bool Time::istGleich(const char* format, const char* zeit) const
+bool Time::isEqual(const char* format, const char* zeit) const
 {
     int y = datum->getJahr();
     int m = datum->getMonat();
@@ -1564,21 +1564,21 @@ bool Time::istGleich(const char* format, const char* zeit) const
             break;
         }
     }
-    return datum->istGleich(y, m, d) && uhrzeit->istGleich(h, i, s);
+    return datum->isEqual(y, m, d) && uhrzeit->isEqual(h, i, s);
 }
 
-bool Time::istGleich(const char* format, Text* zeit) const
+bool Time::isEqual(const char* format, Text* zeit) const
 {
-    bool ret = istGleich(format, zeit->getText());
+    bool ret = isEqual(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-bool Time::istGleich(
+bool Time::isEqual(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde) const
 {
-    return datum->istGleich(jahr, monat, tag)
-        && uhrzeit->istGleich(stunde, minute, sekunde);
+    return datum->isEqual(jahr, monat, tag)
+        && uhrzeit->isEqual(stunde, minute, sekunde);
 }
 
 Date* Time::getDate() const // returns the date
@@ -1601,17 +1601,17 @@ Clock* Time::zClock() const
     return uhrzeit;
 }
 
-bool Time::istKleiner(
+bool Time::isSmaller(
 Time* zeit) const // checks if the time is less than zeit
 {
-    if (datum->istKleiner(zeit->getDate()))
+    if (datum->isSmaller(zeit->getDate()))
     {
         zeit->release();
         return 1;
     }
-    else if (datum->istGleich(zeit->getDate()))
+    else if (datum->isEqual(zeit->getDate()))
     {
-        if (uhrzeit->istKleiner(zeit->getClock()))
+        if (uhrzeit->isSmaller(zeit->getClock()))
         {
             zeit->release();
             return 1;
@@ -1629,14 +1629,14 @@ Time* zeit) const // checks if the time is less than zeit
     }
 }
 
-bool Time::istKleiner(
+bool Time::isSmaller(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde) const
 {
-    if (datum->istKleiner(jahr, monat, tag))
+    if (datum->isSmaller(jahr, monat, tag))
         return 1;
-    else if (datum->istGleich(jahr, monat, tag))
+    else if (datum->isEqual(jahr, monat, tag))
     {
-        if (uhrzeit->istKleiner(stunde, minute, sekunde))
+        if (uhrzeit->isSmaller(stunde, minute, sekunde))
             return 1;
         else
             return 0;
@@ -1645,7 +1645,7 @@ bool Time::istKleiner(
         return 0;
 }
 
-bool Time::istKleiner(const char* format, const char* zeit) const
+bool Time::isSmaller(const char* format, const char* zeit) const
 {
     int y = datum->getJahr();
     int m = datum->getMonat();
@@ -1695,11 +1695,11 @@ bool Time::istKleiner(const char* format, const char* zeit) const
             break;
         }
     }
-    if (datum->istKleiner(y, m, d))
+    if (datum->isSmaller(y, m, d))
         return 1;
-    else if (datum->istGleich(y, m, d))
+    else if (datum->isEqual(y, m, d))
     {
-        if (uhrzeit->istKleiner(h, i, s))
+        if (uhrzeit->isSmaller(h, i, s))
             return 1;
         else
             return 0;
@@ -1708,24 +1708,24 @@ bool Time::istKleiner(const char* format, const char* zeit) const
         return 0;
 }
 
-bool Time::istKleiner(const char* format, Text* zeit) const
+bool Time::isSmaller(const char* format, Text* zeit) const
 {
-    bool ret = istKleiner(format, zeit->getText());
+    bool ret = isSmaller(format, zeit->getText());
     zeit->release();
     return ret;
 }
 
-bool Time::istLater(
+bool Time::isLater(
 Time* zeit) const // checks if the time is greater than zeit
 {
-    if (datum->istLater(zeit->getDate()))
+    if (datum->isLater(zeit->getDate()))
     {
         zeit->release();
         return 1;
     }
-    else if (datum->istGleich(zeit->getDate()))
+    else if (datum->isEqual(zeit->getDate()))
     {
-        if (uhrzeit->istLater(zeit->getClock()))
+        if (uhrzeit->isLater(zeit->getClock()))
         {
             zeit->release();
             return 1;
@@ -1743,14 +1743,14 @@ Time* zeit) const // checks if the time is greater than zeit
     }
 }
 
-bool Time::istLater(
+bool Time::isLater(
     int jahr, int monat, int tag, int stunde, int minute, int sekunde) const
 {
-    if (datum->istLater(jahr, monat, tag))
+    if (datum->isLater(jahr, monat, tag))
         return 1;
-    else if (datum->istGleich(jahr, monat, tag))
+    else if (datum->isEqual(jahr, monat, tag))
     {
-        if (uhrzeit->istLater(stunde, minute, sekunde))
+        if (uhrzeit->isLater(stunde, minute, sekunde))
             return 1;
         else
             return 0;
@@ -1759,7 +1759,7 @@ bool Time::istLater(
         return 0;
 }
 
-bool Time::istLater(const char* format, const char* zeit) const
+bool Time::isLater(const char* format, const char* zeit) const
 {
     int y = datum->getJahr();
     int m = datum->getMonat();
@@ -1809,11 +1809,11 @@ bool Time::istLater(const char* format, const char* zeit) const
             break;
         }
     }
-    if (datum->istLater(y, m, d))
+    if (datum->isLater(y, m, d))
         return 1;
-    else if (datum->istGleich(y, m, d))
+    else if (datum->isEqual(y, m, d))
     {
-        if (uhrzeit->istLater(h, i, s))
+        if (uhrzeit->isLater(h, i, s))
             return 1;
         else
             return 0;
@@ -1822,9 +1822,9 @@ bool Time::istLater(const char* format, const char* zeit) const
         return 0;
 }
 
-bool Time::istLater(const char* format, Text* zeit) const
+bool Time::isLater(const char* format, Text* zeit) const
 {
-    bool ret = istLater(format, zeit->getText());
+    bool ret = isLater(format, zeit->getText());
     zeit->release();
     return ret;
 }
@@ -1842,14 +1842,14 @@ Timer::Timer()
 Timer::~Timer() {}
 
 // non-constant
-void Timer::messungStart() // sets the start point of the time measurement
+void Timer::measureStart() // 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 Timer::messungEnde() // sets the end point of the time measurement
+void Timer::measureEnd() // sets the end point of the time measurement
 {
     timeval tv;
     gettimeofday(&tv, 0);
@@ -1947,7 +1947,7 @@ Time* Framework::getTime() // returns the current time (date and time of day)
 #endif
 }
 
-bool Framework::istSchaltjahr(int jahr) // checks if jahr is a leap year
+bool Framework::isLeapYear(int jahr) // checks if jahr is a leap year
 {
     if (jahr % 4 == 0)
     {

Time.h

@@ -103,9 +103,9 @@ namespace Framework
         //! Calculates the sum of this and another time and stores the result.
         //! \param stunde The hours to add.
         //! \return The number of remaining days.
-        //! Example: Old time: 20:50:30, plusStunde( 10 ); return 1,
+        //! Example: Old time: 20:50:30, plusHour( 10 ); return 1,
         //! stored time: 6:50:30
-        DLLEXPORT int plusStunde(__int64 stunde);
+        DLLEXPORT int plusHour(__int64 stunde);
         //! Calculates the sum of this and another time and stores the result.
         //! \param minute The minutes to add.
         //! \return The number of remaining days.
@@ -115,9 +115,9 @@ namespace Framework
         //! Calculates the sum of this and another time and stores the result.
         //! \param sekunde The seconds to add.
         //! \return The number of remaining days.
-        //! Example: Old time: 23:59:30, plusSekunde( 40 ); return 1,
+        //! Example: Old time: 23:59:30, plusSecond( 40 ); return 1,
         //! stored time: 00:00:10
-        DLLEXPORT int plusSekunde(__int64 sekunde);
+        DLLEXPORT int plusSecond(__int64 sekunde);
         //! Subtracts a given time from this one and stores the result.
         //! \param zeit The time to subtract.
         //! \return The number of remaining days.
@@ -151,9 +151,9 @@ namespace Framework
         //! Subtracts a given time from this one and stores the result.
         //! \param stunde The hours to subtract.
         //! \return The number of remaining days.
-        //! Example: Old time: 10:40:18, minusStunde( 19 ); return -1,
+        //! Example: Old time: 10:40:18, minusHour( 19 ); return -1,
         //! stored time: 15:40:18
-        DLLEXPORT int minusStunde(__int64 stunde);
+        DLLEXPORT int minusHour(__int64 stunde);
         //! Subtracts a given time from this one and stores the result.
         //! \param minute The minutes to subtract.
         //! \return The number of remaining days.
@@ -163,9 +163,9 @@ namespace Framework
         //! Subtracts a given time from this one and stores the result.
         //! \param sekunde The seconds to subtract.
         //! \return The number of remaining days.
-        //! Example: Old time: 00:00:20, minusSekunde( 50 ); return -1,
+        //! Example: Old time: 00:00:20, minusSecond( 50 ); return -1,
         //! stored time: 23:59:30
-        DLLEXPORT int minusSekunde(__int64 sekunde);
+        DLLEXPORT int minusSecond(__int64 sekunde);
 
         //! Returns the hour.
         DLLEXPORT int getStunde() const;
@@ -182,21 +182,21 @@ namespace Framework
         //! \param zeit The time to compare with.
         //! \return (true) if both times are equal. (false) if they
         //! are not equal.
-        DLLEXPORT bool istGleich(Clock* zeit) const;
+        DLLEXPORT bool isEqual(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
         //! zeit A string containing the other time. \return
         //! (true) if both times are equal. (false) if they
         //! are not equal.
-        DLLEXPORT bool istGleich(const char* format, const char* zeit) const;
+        DLLEXPORT bool isEqual(const char* format, const char* 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
         //! zeit A Text object containing the other time.
         //! \return (true) if both times are equal. (false) if they
         //! are not equal.
-        DLLEXPORT bool istGleich(const char* format, Text* zeit) const;
+        DLLEXPORT bool isEqual(const char* format, Text* zeit) const;
         //! Checks if the time equals the given time. Does not validate
         //! whether the given time is a valid time of day.
         //! \param stunde The hours of the time to check.
@@ -204,81 +204,81 @@ namespace Framework
         //! \param sekunde The seconds of the time to check.
         //! \return (true) if both times are equal. (false) if they
         //! are not equal.
-        DLLEXPORT bool istGleich(int stunde, int minute, int sekunde) const;
+        DLLEXPORT bool isEqual(int stunde, int minute, int sekunde) const;
         //! Checks if the hour equals the given hour.
         //! \param stunde The hour to check.
         //! \return (true) if the hours are equal. (false) if they
         //! are not equal.
-        DLLEXPORT bool stundeGleich(int stunde) const;
+        DLLEXPORT bool hourEqual(int stunde) const;
         //! Checks if the minute equals the given minute.
         //! \param minute The minute to check.
         //! \return (true) if the minutes are equal. (false) if they
         //! are not equal.
-        DLLEXPORT bool minuteGleich(int minute) const;
+        DLLEXPORT bool minuteEqual(int minute) const;
         //! Checks if the second equals the given second.
         //! \param sekunde The second to check.
         //! \return (true) if the seconds are equal. (false) if they
         //! are not equal.
-        DLLEXPORT bool sekundeGleich(int sekunde) const;
+        DLLEXPORT bool secondEqual(int sekunde) const;
         //! Checks if the time is less than zeit.
         //! \param zeit The time to check against.
         //! \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(Clock* zeit) const;
+        //! Example: (5:30:00).isSmaller( (10:40:29) ); return true
+        DLLEXPORT bool isSmaller(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.
         //! \param sekunde The seconds of the time to check.
         //! \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(int stunde, int minute, int sekunde) const;
+        //! Example: (5:30:00).isSmaller( 10, 40, 29 ); return true
+        DLLEXPORT bool isSmaller(int stunde, int minute, int sekunde) const;
         //! Checks if the time is less than the given 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 other time. \return
         //! (true) if the stored time is less than the given
         //! time. (false) otherwise.
-        //! Example: (5:30:00).istKleiner( "h:i:s", "10:40:29" ); return true
-        DLLEXPORT bool istKleiner(const char* format, const char* zeit) const;
+        //! Example: (5:30:00).isSmaller( "h:i:s", "10:40:29" ); return true
+        DLLEXPORT bool isSmaller(const char* format, const char* zeit) const;
         //! Checks if the time is less than the given 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 other time.
         //! \return (true) if the stored time is less than the given
         //! time. (false) otherwise.
-        DLLEXPORT bool istKleiner(const char* format, Text* zeit) const;
+        DLLEXPORT bool isSmaller(const char* format, Text* zeit) const;
         //! Checks if the time is greater than zeit.
         //! \param zeit The time to check against.
         //! \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(Clock* zeit) const;
+        //! Example: (5:30:00).isLater( (10:40:29) ); return false
+        DLLEXPORT bool isLater(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.
         //! \param sekunde The seconds of the time to check.
         //! \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(int stunde, int minute, int sekunde) const;
+        //! Example: (5:30:00).isLater( 10, 40, 29 ); return false
+        DLLEXPORT bool isLater(int stunde, int minute, int sekunde) const;
         //! Checks if the time is greater than the given 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 other time. \return
         //! (true) if the stored time is greater than the given
         //! time. (false) otherwise.
-        //! Example: (5:30:00).istLater( "h:i:s", "10:40:29" ); return false
-        DLLEXPORT bool istLater(const char* format, const char* zeit) const;
+        //! Example: (5:30:00).isLater( "h:i:s", "10:40:29" ); return false
+        DLLEXPORT bool isLater(const char* format, const char* zeit) const;
         //! Checks if the time is greater than the given 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 other time.
         //! \return (true) if the stored time is greater than the given
         //! time. (false) otherwise.
-        //! Example: (5:30:00).istLater( "h:i:s", "10:40:29" ); return false
-        DLLEXPORT bool istLater(const char* format, Text* zeit) const;
+        //! Example: (5:30:00).isLater( "h:i:s", "10:40:29" ); return false
+        DLLEXPORT bool isLater(const char* format, Text* zeit) const;
     };
 
     //! This class stores a date in the form of year, month and day
@@ -349,16 +349,16 @@ namespace Framework
         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
-        DLLEXPORT void plusJahr(int jahr);
+        //! Example: ( 1.11.1995 ).plusYear( 21 ); new date: 1.11.2016
+        DLLEXPORT void plusYear(int jahr);
         //! Adds the given month to the current date and stores the result.
         //! \param monat The month to add.
-        //! Example: ( 1.11.1995 ).plusMonat( 13 ); new date: 1.12.1996
-        DLLEXPORT void plusMonat(int monat);
+        //! Example: ( 1.11.1995 ).plusMonth( 13 ); new date: 1.12.1996
+        DLLEXPORT void plusMonth(int monat);
         //! Adds the given day to the current date and stores the result.
         //! \param tag The day to add.
-        //! Example: ( 1.1.2000 ).plusTag( 32 ); new date: 2.2.2000
-        DLLEXPORT void plusTag(int tag);
+        //! Example: ( 1.1.2000 ).plusDay( 32 ); new date: 2.2.2000
+        DLLEXPORT void plusDay(int tag);
         //! Subtracts the given date from the current date and stores the result.
         //! \param datum The date to subtract.
         //! Example: ( 2.12.1996 ).minusDate( ( 1.1.1 ) ); new date: 1.11.1995
@@ -384,16 +384,16 @@ namespace Framework
         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
-        DLLEXPORT void minusJahr(int jahr);
+        //! Example: ( 1.11.1996 ).minusYear( 1 ); new date: 1.11.1995
+        DLLEXPORT void minusYear(int jahr);
         //! Subtracts the given month from the current date and stores the result.
         //! \param monat The month to subtract.
-        //! Example: ( 1.12.1996 ).minusMonat( 13 ); new date: 1.11.1995
-        DLLEXPORT void minusMonat(int monat);
+        //! Example: ( 1.12.1996 ).minusMonth( 13 ); new date: 1.11.1995
+        DLLEXPORT void minusMonth(int monat);
         //! Subtracts the given day from the current date and stores the result.
         //! \param tag The day to subtract.
-        //! Example: ( 5.2.2016 ).minusTag( 11 ); new date: 25.1.2016
-        DLLEXPORT void minusTag(int tag);
+        //! Example: ( 5.2.2016 ).minusDay( 11 ); new date: 25.1.2016
+        DLLEXPORT void minusDay(int tag);
 
         //! Returns the year.
         DLLEXPORT int getJahr() const;
@@ -410,106 +410,106 @@ namespace Framework
         //! \param datum The date to check.
         //! \return (true) if the given date matches the stored one.
         //! (false) otherwise.
-        DLLEXPORT bool istGleich(Date* datum) const;
+        DLLEXPORT bool isEqual(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
         //! A string containing the date to check. \return
         //! (true) if the given date matches the stored one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istGleich( "y-m-d", "1995-11-1" ); return: true
-        DLLEXPORT bool istGleich(const char* format, const char* datum) const;
+        //! Example: ( 1.11.1995 ).isEqual( "y-m-d", "1995-11-1" ); return: true
+        DLLEXPORT bool isEqual(const char* format, const char* 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
         //! A Text object containing the date to check.
         //! \return (true) if the given date matches the stored one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istGleich( "y-m-d", new Text( "1995-11-1" ) ); return: true
-        DLLEXPORT bool istGleich(const char* format, Text* datum) const;
+        //! Example: ( 1.11.1995 ).isEqual( "y-m-d", new Text( "1995-11-1" ) ); return: true
+        DLLEXPORT bool isEqual(const char* format, Text* datum) const;
         //! Checks if the date equals the given date.
         //! \param jahr The year of the date to check.
         //! \param monat The month of the date to check.
         //! \param tag The day of the date to check.
         //! \return (true) if the given date matches the stored one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istGleich( 1995, 11, 1 ); return: true
-        DLLEXPORT bool istGleich(int jahr, int monat, int tag) const;
+        //! Example: ( 1.11.1995 ).isEqual( 1995, 11, 1 ); return: true
+        DLLEXPORT bool isEqual(int jahr, int monat, int tag) const;
         //! Checks if the year equals the given year.
         //! \param jahr The year to check.
         //! \return (true) if the given year matches the stored one.
         //! (false) otherwise.
-        DLLEXPORT bool jahrGleich(int jahr) const;
+        DLLEXPORT bool yearEqual(int jahr) const;
         //! Checks if the month equals the given month.
         //! \param monat The month to check.
         //! \return (true) if the given month matches the stored one.
         //! (false) otherwise.
-        DLLEXPORT bool monatGleich(int monat) const;
+        DLLEXPORT bool monthEqual(int monat) const;
         //! Checks if the day equals the given day.
         //! \param tag The day to check.
         //! \return (true) if the given day matches the stored one.
         //! (false) otherwise.
-        DLLEXPORT bool tagGleich(int tag) const;
+        DLLEXPORT bool dayEqual(int tag) const;
         //! Checks if the stored date is less than the given one.
         //! \param datum The date to check.
         //! \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(Date* datum) const;
+        //! Example: ( 1.11.1995 ).isSmaller( ( 23.1.2016 ) ); return true
+        DLLEXPORT bool isSmaller(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.
         //! \param tag The day of the date to check.
         //! \return (true) if the stored date is before the given one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istKleiner( 2016, 1, 23 ); return true
-        DLLEXPORT bool istKleiner(int jahr, int monat, int tag) const;
+        //! Example: ( 1.11.1995 ).isSmaller( 2016, 1, 23 ); return true
+        DLLEXPORT bool isSmaller(int jahr, int monat, int tag) const;
         //! Checks if the stored date is less than the given one.
         //! \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 check. \return
         //! (true) if the stored date is before the given one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istKleiner( "y, m, d", "2016, 1, 23" ); return true
-        DLLEXPORT bool istKleiner(const char* format, const char* datum) const;
+        //! Example: ( 1.11.1995 ).isSmaller( "y, m, d", "2016, 1, 23" ); return true
+        DLLEXPORT bool isSmaller(const char* format, const char* datum) const;
         //! Checks if the stored date is less than the given one.
         //! \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 check.
         //! \return (true) if the stored date is before the given one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istKleiner( "y, m, d", new Text( "2016, 1, 23" ) ); return true
-        DLLEXPORT bool istKleiner(const char* format, Text* datum) const;
+        //! Example: ( 1.11.1995 ).isSmaller( "y, m, d", new Text( "2016, 1, 23" ) ); return true
+        DLLEXPORT bool isSmaller(const char* format, Text* datum) const;
         //! Checks if the stored date is greater than the given one.
         //! \param datum The date to check.
         //! \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(Date* datum) const;
+        //! Example: ( 1.11.1995 ).isLater( ( 23.1.2016 ) ); return false
+        DLLEXPORT bool isLater(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.
         //! \param tag The day of the date to check.
         //! \return (true) if the stored date is after the given one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istLater( 2016, 1, 23 ); return false
-        DLLEXPORT bool istLater(int jahr, int monat, int tag) const;
+        //! Example: ( 1.11.1995 ).isLater( 2016, 1, 23 ); return false
+        DLLEXPORT bool isLater(int jahr, int monat, int tag) const;
         //! Checks if the stored date is greater than the given one.
         //! \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 check. \return
         //! (true) if the stored date is after the given one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istLater( "y, m, d", "2016, 1, 23" ); return false
-        DLLEXPORT bool istLater(const char* format, const char* datum) const;
+        //! Example: ( 1.11.1995 ).isLater( "y, m, d", "2016, 1, 23" ); return false
+        DLLEXPORT bool isLater(const char* format, const char* datum) const;
         //! Checks if the stored date is greater than the given one.
         //! \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 check.
         //! \return (true) if the stored date is after the given one.
         //! (false) otherwise.
-        //! Example: ( 1.11.1995 ).istLater( "y, m, d", new Text( "2016, 1, 23" ) ); return true
-        DLLEXPORT bool istLater(const char* format, Text* datum) const;
+        //! Example: ( 1.11.1995 ).isLater( "y, m, d", new Text( "2016, 1, 23" ) ); return true
+        DLLEXPORT bool isLater(const char* format, Text* datum) const;
     };
 
     //! This class combines the Date and Clock classes and thus stores
@@ -596,22 +596,22 @@ namespace Framework
         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);
+        DLLEXPORT void plusYear(int jahr);
         //! Adds the given time and stores the result.
         //! \param monat The month to add.
-        DLLEXPORT void plusMonat(int monat);
+        DLLEXPORT void plusMonth(int monat);
         //! Adds the given time and stores the result.
         //! \param tag The day to add.
-        DLLEXPORT void plusTag(int tag);
+        DLLEXPORT void plusDay(int tag);
         //! Adds the given time and stores the result.
         //! \param stunde The hour to add.
-        DLLEXPORT void plusStunde(__int64 stunde);
+        DLLEXPORT void plusHour(__int64 stunde);
         //! Adds the given time and stores the result.
         //! \param minute The minute to add.
         DLLEXPORT void plusMinute(__int64 minute);
         //! Adds the given time and stores the result.
         //! \param sekunde The second to add.
-        DLLEXPORT void plusSekunde(__int64 sekunde);
+        DLLEXPORT void plusSecond(__int64 sekunde);
         //! Subtracts the given time and stores the result.
         //! \param zeit The time to subtract.
         DLLEXPORT void minusTime(Time* zeit);
@@ -638,22 +638,22 @@ namespace Framework
         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);
+        DLLEXPORT void minusYear(int jahr);
         //! Subtracts the given time and stores the result.
         //! \param monat The month to subtract.
-        DLLEXPORT void minusMonat(int monat);
+        DLLEXPORT void minusMonth(int monat);
         //! Subtracts the given time and stores the result.
         //! \param tag The day to subtract.
-        DLLEXPORT void minusTag(int tag);
+        DLLEXPORT void minusDay(int tag);
         //! Subtracts the given time and stores the result.
         //! \param stunde The hour to subtract.
-        DLLEXPORT void minusStunde(__int64 stunde);
+        DLLEXPORT void minusHour(__int64 stunde);
         //! Subtracts the given time and stores the result.
         //! \param minute The minute to subtract.
         DLLEXPORT void minusMinute(__int64 minute);
         //! Subtracts the given time and stores the result.
         //! \param sekunde The second to subtract.
-        DLLEXPORT void minusSekunde(__int64 sekunde);
+        DLLEXPORT void minusSecond(__int64 sekunde);
         //! Returns the stored time as text.
         //! \param format A string specifying the format of the
         //! returned time. y=year, m=month, d=day, h=hour,
@@ -662,21 +662,21 @@ namespace Framework
         //! 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(Time* zeit) const;
+        DLLEXPORT bool isEqual(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,
         //! i=minute, s=second. \param zeit A string containing the
         //! time to check. \return (true) if the times are equal.
         //! (false) otherwise.
-        DLLEXPORT bool istGleich(const char* format, const char* zeit) const;
+        DLLEXPORT bool isEqual(const char* format, const char* 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,
         //! i=minute, s=second. \param zeit A Text object containing the
         //! time to check. \return (true) if the times are equal.
         //! (false) otherwise.
-        DLLEXPORT bool istGleich(const char* format, Text* zeit) const;
+        DLLEXPORT bool isEqual(const char* format, Text* zeit) const;
         //! Checks if the time equals the given time.
         //! \param jahr The year to check.
         //! \param monat The month to check.
@@ -685,7 +685,7 @@ namespace Framework
         //! \param minute The minute to check.
         //! \param sekunde The second to check.
         //! \return (true) if the times are equal. (false) otherwise.
-        DLLEXPORT bool istGleich(int jahr,
+        DLLEXPORT bool isEqual(int jahr,
             int monat,
             int tag,
             int stunde,
@@ -703,7 +703,7 @@ namespace Framework
         //! \param zeit The time to check. \return (true)
         //! if the stored time is before the given time. (false)
         //! otherwise.
-        DLLEXPORT bool istKleiner(Time* zeit) const;
+        DLLEXPORT bool isSmaller(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.
@@ -711,7 +711,7 @@ namespace Framework
         //! minute to check. \param sekunde The second to check.
         //! \return (true) if the stored time is before the given time.
         //! (false) otherwise.
-        DLLEXPORT bool istKleiner(int jahr,
+        DLLEXPORT bool isSmaller(int jahr,
             int monat,
             int tag,
             int stunde,
@@ -723,19 +723,19 @@ namespace Framework
         //! i=minute, s=second. \param zeit A string containing the
         //! time to check. \return (true) if the stored time is before
         //! the given time. (false) otherwise.
-        DLLEXPORT bool istKleiner(const char* format, const char* zeit) const;
+        DLLEXPORT bool isSmaller(const char* format, const char* zeit) const;
         //! Checks if the stored time is less than the given time.
         //! \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 check. \return (true) if the stored time is before
         //! the given time. (false) otherwise.
-        DLLEXPORT bool istKleiner(const char* format, Text* zeit) const;
+        DLLEXPORT bool isSmaller(const char* format, Text* zeit) const;
         //! Checks if the stored time is greater than the given time.
         //! \param zeit The time to check. \return (true)
         //! if the stored time is after the given time. (false)
         //! otherwise.
-        DLLEXPORT bool istLater(Time* zeit) const;
+        DLLEXPORT bool isLater(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.
@@ -743,7 +743,7 @@ namespace Framework
         //! minute to check. \param sekunde The second to check.
         //! \return (true) if the stored time is after the given time.
         //! (false) otherwise.
-        DLLEXPORT bool istLater(int jahr,
+        DLLEXPORT bool isLater(int jahr,
             int monat,
             int tag,
             int stunde,
@@ -755,14 +755,14 @@ namespace Framework
         //! i=minute, s=second. \param zeit A string containing the
         //! time to check. \return (true) if the stored time is after
         //! the given time. (false) otherwise.
-        DLLEXPORT bool istLater(const char* format, const char* zeit) const;
+        DLLEXPORT bool isLater(const char* format, const char* zeit) const;
         //! Checks if the stored time is greater than the given time.
         //! \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 check. \return (true) if the stored time is after
         //! the given time. (false) otherwise.
-        DLLEXPORT bool istLater(const char* format, Text* zeit) const;
+        DLLEXPORT bool isLater(const char* format, Text* zeit) const;
     };
 
     //! Diese Class kann messen, wie viel Time zwischen zwei TimePoints
@@ -780,9 +780,9 @@ namespace Framework
         //! Deletes the current object
         DLLEXPORT ~Timer();
         //! Sets the start point of the time measurement
-        DLLEXPORT void messungStart();
+        DLLEXPORT void measureStart();
         //! Sets the end point of the time measurement
-        DLLEXPORT void messungEnde();
+        DLLEXPORT void measureEnd();
         //! Returns the interval between start and end of the measurement
         //! in seconds
         DLLEXPORT double getSekunden() const;
@@ -805,7 +805,7 @@ namespace Framework
     //! 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.
-    DLLEXPORT bool istSchaltjahr(int jahr);
+    DLLEXPORT bool isLeapYear(int jahr);
 } // namespace Framework
 
 #endif

ToolTip.cpp

@@ -21,18 +21,18 @@ ToolTip::ToolTip(Screen* zScreen)
       warten(1),
       wartenCount(0),
       tval(0),
-      mausIn(0),
+      mouseIn(0),
       alpha(0),
-      sichtbar(0),
+      visible(0),
       zeichnen(0),
-      mausIn2(0),
+      mouseIn2(0),
       bildschirm(zScreen),
       onShow(0),
       onHide(0)
 {
     style = Style::MEIgnoreInside | Style::MEIgnoreParentInside
-          | Style::MEIgnoreSichtbar | Style::MEIgnoreVerarbeitet
-          | Style::Erlaubt;
+          | Style::MEIgnoreVisible | Style::MEIgnoreProcessed
+          | Style::Allowed;
     members = new RCArray<Drawable>();
     bildschirm->addToolTip(dynamic_cast<ToolTip*>(this->getThis()));
     setMouseEvent(_ret1ME);
@@ -46,64 +46,64 @@ ToolTip::~ToolTip()
 
 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
+    if (!visible) pos.x += me.mx, pos.y += me.my + 15;
+    if (hasStyleNot(Style::Visible) || !me.insideParent || me.processed
         || me.mx < 0 || me.my < 0 || me.mx >= gr.x || me.my >= gr.y || !userRet)
     {
-        mausIn2 = 0;
-        if (!mausIn && sichtbar)
+        mouseIn2 = 0;
+        if (!mouseIn && visible)
         {
-            if (onHide && sichtbar) onHide(this);
-            sichtbar = 0;
+            if (onHide && visible) onHide(this);
+            visible = 0;
         }
-        bool verarbeitet = me.verarbeitet;
-        me.verarbeitet |= hatStyleNicht(Style::Sichtbar);
+        bool processed = me.processed;
+        me.processed |= hasStyleNot(Style::Visible);
         bool insideParent = me.insideParent;
         me.insideParent = 0;
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
+        if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
         me.mx -= rbr;
         me.my -= rbr;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
             me.my += vertikalScrollBar->getScroll();
-        if (hatStyle(Style::HScroll) && horizontalScrollBar)
+        if (hasStyle(Style::HScroll) && horizontalScrollBar)
             me.mx += horizontalScrollBar->getScroll();
-        if (me.id != ME_Betritt && me.id != ME_Leaves)
+        if (me.id != ME_Enter && me.id != ME_Leaves)
         {
             for (int i = members->getEntryCount() - 1; i >= 0; i--)
                 members->z(i)->doPublicMouseEvent(me);
         }
         me.mx += rbr;
         me.my += rbr;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
             me.my -= vertikalScrollBar->getScroll();
-        if (hatStyle(Style::HScroll) && horizontalScrollBar)
+        if (hasStyle(Style::HScroll) && horizontalScrollBar)
             me.mx -= horizontalScrollBar->getScroll();
         me.insideParent = insideParent;
-        if (hatStyleNicht(Style::Sichtbar)) me.verarbeitet = verarbeitet;
+        if (hasStyleNot(Style::Visible)) me.processed = processed;
         return;
     }
-    mausIn2 = 1;
-    if (sichtbar)
+    mouseIn2 = 1;
+    if (visible)
     {
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
+        if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
         me.mx -= rbr;
         me.my -= rbr;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
             me.my += vertikalScrollBar->getScroll();
-        if (hatStyle(Style::HScroll) && horizontalScrollBar)
+        if (hasStyle(Style::HScroll) && horizontalScrollBar)
             me.mx += horizontalScrollBar->getScroll();
         for (auto z : *members)
             z->doPublicMouseEvent(me);
         me.mx += rbr;
         me.my += rbr;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
             me.my -= vertikalScrollBar->getScroll();
-        if (hatStyle(Style::HScroll) && horizontalScrollBar)
+        if (hasStyle(Style::HScroll) && horizontalScrollBar)
             me.mx -= horizontalScrollBar->getScroll();
     }
-    if (sichtbar) me.verarbeitet = 1;
+    if (visible) me.processed = 1;
     if (alpha) rend = 1;
 }
 
@@ -160,23 +160,23 @@ void ToolTip::setAnimationSpeed(double speed)
     animationSpeed = speed;
 }
 
-void ToolTip::setMausIn(bool mausIn)
+void ToolTip::setMouseIn(bool mouseIn)
 {
-    if (this->mausIn != mausIn) rend = 1;
-    this->mausIn = mausIn;
-    if (!mausIn && !mausIn2 && sichtbar)
+    if (this->mouseIn != mouseIn) rend = 1;
+    this->mouseIn = mouseIn;
+    if (!mouseIn && !mouseIn2 && visible)
     {
-        if (sichtbar && onHide) onHide(this);
-        sichtbar = 0;
+        if (visible && onHide) onHide(this);
+        visible = 0;
     }
 }
 
-void ToolTip::wartenReset()
+void ToolTip::waitReset()
 {
     wartenCount = 0;
 }
 
-void ToolTip::setZeichnen()
+void ToolTip::setDrawing()
 {
     zeichnen = 1;
 }
@@ -186,7 +186,7 @@ bool ToolTip::tick(double tickVal)
     for (auto z : *members)
     {
         size.x
-            = MAX(size.x, z->getX() + z->getBreite() + 2 * getBorderWidth());
+            = MAX(size.x, z->getX() + z->getWidth() + 2 * getBorderWidth());
         size.y
             = MAX(size.y, z->getY() + z->getHeight() + 2 * getBorderWidth());
     }
@@ -199,7 +199,7 @@ bool ToolTip::tick(double tickVal)
         return ret;
     }
     this->tval -= val;
-    if (!sichtbar)
+    if (!visible)
     {
         if (alpha)
         {
@@ -209,13 +209,13 @@ bool ToolTip::tick(double tickVal)
                 alpha = (unsigned char)(alpha - val);
             rend = 1;
         }
-        if (mausIn)
+        if (mouseIn)
         {
             wartenCount += tickVal;
             if (wartenCount >= warten)
             {
                 if (onShow) onShow(this);
-                sichtbar = 1;
+                visible = 1;
                 wartenCount = 0;
                 alpha = 0xFF;
                 DrawableBackground::setSize(0, 0);
@@ -226,18 +226,18 @@ bool ToolTip::tick(double tickVal)
     }
     else
     {
-        if (getBreite() < size.x)
+        if (getWidth() < size.x)
         {
-            DrawableBackground::setSize(getBreite() + val, getHeight());
-            if (getBreite() > size.x)
+            DrawableBackground::setSize(getWidth() + val, getHeight());
+            if (getWidth() > size.x)
                 DrawableBackground::setSize(size.x, getHeight());
             rend = 1;
         }
         if (getHeight() < size.y)
         {
-            DrawableBackground::setSize(getBreite(), getHeight() + val);
+            DrawableBackground::setSize(getWidth(), getHeight() + val);
             if (getHeight() > size.y)
-                DrawableBackground::setSize(getBreite(), size.y);
+                DrawableBackground::setSize(getWidth(), size.y);
             rend = 1;
         }
     }
@@ -246,23 +246,23 @@ bool ToolTip::tick(double tickVal)
 
 void ToolTip::render(Image& zRObj)
 {
-    if (alpha && (zeichnen || mausIn2))
+    if (alpha && (zeichnen || mouseIn2))
     {
         zRObj.setAlpha(alpha);
         setPosition(pos);
-        if (getX() + getBreite() > zRObj.getBreite())
+        if (getX() + getWidth() > zRObj.getWidth())
             setPosition(
-                getX() - (getX() + getBreite() - zRObj.getBreite()), getY());
+                getX() - (getX() + getWidth() - zRObj.getWidth()), getY());
         if (getY() + getHeight() > zRObj.getHeight())
             setPosition(
                 getX(), getY() - (getY() + getHeight() - zRObj.getHeight()));
         DrawableBackground::render(zRObj);
-        Punkt p = pos;
-        Punkt s = gr;
-        if (hatStyle(DrawableBackground::Style::Border))
+        Point p = pos;
+        Point s = gr;
+        if (hasStyle(DrawableBackground::Style::Border))
         {
-            p += Punkt(getBorderWidth(), getBorderWidth());
-            s -= Punkt(getBorderWidth(), getBorderWidth()) * 2;
+            p += Point(getBorderWidth(), getBorderWidth());
+            s -= Point(getBorderWidth(), getBorderWidth()) * 2;
         }
         if (!zRObj.setDrawOptions(p, s))
         {
@@ -270,8 +270,8 @@ void ToolTip::render(Image& zRObj)
             zeichnen = 0;
             return;
         }
-        bool vSc = hatStyle(Style::VScroll) && vertikalScrollBar;
-        bool hSc = hatStyle(Style::HScroll) && horizontalScrollBar;
+        bool vSc = hasStyle(Style::VScroll) && vertikalScrollBar;
+        bool hSc = hasStyle(Style::HScroll) && horizontalScrollBar;
         zRObj.addScrollOffset(hSc ? horizontalScrollBar->getScroll() : 0,
             vSc ? vertikalScrollBar->getScroll() : 0);
         for (auto z : *members)
@@ -303,13 +303,13 @@ Drawable* ToolTip::getMember(int i) const
 }
 
 // Returns the number of drawings that belong to the tooltip
-int ToolTip::getMemberAnzahl() const
+int ToolTip::getMemberCount() const
 {
     return members->getEntryCount();
 }
 
 // Creates a complete copy of a tooltip
-Drawable* ToolTip::dublizieren() const
+Drawable* ToolTip::duplicate() const
 {
     ToolTip* ret = new ToolTip(bildschirm);
     ret->size = size;
@@ -317,11 +317,11 @@ Drawable* ToolTip::dublizieren() const
     ret->warten = warten;
     ret->wartenCount = wartenCount;
     ret->tval = tval;
-    ret->mausIn = mausIn;
+    ret->mouseIn = mouseIn;
     ret->alpha = alpha;
-    ret->sichtbar = sichtbar;
+    ret->visible = visible;
     ret->zeichnen = zeichnen;
-    ret->mausIn2 = mausIn2;
+    ret->mouseIn2 = mouseIn2;
     for (auto z : *members)
         ret->addMember(dynamic_cast<Drawable*>(z->getThis()));
     return ret;
@@ -330,5 +330,5 @@ Drawable* ToolTip::dublizieren() const
 //! Checks whether the tooltip is currently being shown
 DLLEXPORT bool ToolTip::isVisible() const
 {
-    return sichtbar;
+    return visible;
 }

ToolTip.h

@@ -23,16 +23,16 @@ namespace Framework
     {
     private:
         RCArray<Drawable>* members;
-        Punkt size;
+        Point size;
         double animationSpeed;
         double warten;
         double wartenCount;
         double tval;
-        bool mausIn;
+        bool mouseIn;
         unsigned char alpha;
-        bool sichtbar;
+        bool visible;
         bool zeichnen;
-        bool mausIn2;
+        bool mouseIn2;
         Screen* bildschirm;
         std::function<void(ToolTip*)> onShow;
         std::function<void(ToolTip*)> onHide;
@@ -67,13 +67,13 @@ namespace Framework
         //! \param speed Number of pixels faded in per second. (Default: 250)
         DLLEXPORT void setAnimationSpeed(double speed);
         //! Sets whether the mouse is inside the drawing the tip belongs to
-        //! \param mausIn 1 if the mouse is inside the drawing. 0 otherwise
-        DLLEXPORT void setMausIn(bool mausIn);
+        //! \param mouseIn 1 if the mouse is inside the drawing. 0 otherwise
+        DLLEXPORT void setMouseIn(bool mouseIn);
         //! Resets the counter that tracks when the tip should appear
-        DLLEXPORT void wartenReset();
+        DLLEXPORT void waitReset();
         //! Indicates that the drawing the tip belongs to was drawn,
         //! so the tip could also be drawn
-        DLLEXPORT void setZeichnen();
+        DLLEXPORT void setDrawing();
         //! Updates the tip. Called by the framework
         //! \param tickVal The time in seconds since the last call
         //! of this function \return 1 if something changed
@@ -92,9 +92,9 @@ namespace Framework
         //! \param i The index of the member
         DLLEXPORT Drawable* getMember(int i) const;
         //! Returns the number of drawings belonging to the tooltip
-        DLLEXPORT int getMemberAnzahl() const;
+        DLLEXPORT int getMemberCount() const;
         //! Creates a complete copy of a tooltip
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
         //! Checks whether the tooltip is currently visible
         DLLEXPORT bool isVisible() const;
     };

Tree.h

@@ -41,11 +41,11 @@ namespace Framework
             return TreeIterator(this);
         }
 
-        void leeren()
+        void clear()
         {
             if (value) value->release();
             value = 0;
-            subtrees->leeren();
+            subtrees->clear();
         }
 
         void addSubtree(Tree* t)

TriangleList.h

@@ -58,7 +58,7 @@ namespace Framework
         //! Adds a point to the list
         //! \param p The coordinates of the point
         //! \param textur The coordinates in the texture
-        void addPunkt(T* p, Vec2<float>* textur)
+        void addPoint(T* p, Vec2<float>* textur)
         {
             punkte->add(new TriangleVertex<T>(p, textur));
         }
@@ -67,7 +67,7 @@ namespace Framework
         void removeLetztenPunkt()
         {
             int i = punkte->getEntryCount() - 1;
-            if (!punkte->hat(i)) return;
+            if (!punkte->has(i)) return;
             delete punkte->get(i);
             punkte->remove(i);
         }
@@ -78,11 +78,11 @@ namespace Framework
             int anz = punkte->getEntryCount();
             for (int i = 0; i < anz; i++)
                 delete punkte->get(i);
-            punkte->leeren();
+            punkte->clear();
         }
 
         //! Returns the number of triangles
-        int getDreieckAnzahl() const
+        int getTriangleCount() const
         {
             return punkte->getEntryCount() - 2;
         }
@@ -94,7 +94,7 @@ namespace Framework
             bool ret = 1;
             for (int i = 0; i < anz; i++)
             {
-                if (punkte->hat(i)) ret &= punkte->get(i)->textur;
+                if (punkte->has(i)) ret &= punkte->get(i)->textur;
             }
             return ret;
         }

Trie.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "CharMap.h"
 
@@ -212,7 +212,7 @@ namespace Framework
             }
         }
 
-        void leeren()
+        void clear()
         {
             map->release();
             map = new CharMap<Trie<T>, T>();
@@ -300,7 +300,7 @@ namespace Framework
             }
         }
 
-        void leeren()
+        void clear()
         {
             map->release();
             map = new RCCharMap<RCTrie<T>, T>();

UIDialog.cpp

@@ -7,33 +7,33 @@
 
 using namespace Framework;
 
-UIDialog::UIDialog(Font* schrift)
+UIDialog::UIDialog(Font* font)
     : Window()
 {
-    addStyle(Window::Style::normal | Window::Style::BodyHintergrund
-             | Window::Style::TitelHintergrund
-             | Window::Style::ClosingHintergrund);
-    setKBgFarbe(0xFF000000);
-    setTBgFarbe(0xFF000000);
-    setSBgFarbe(0xFF000000);
+    addStyle(Window::Style::normal | Window::Style::BodyBackground
+             | Window::Style::TitleBackground
+             | Window::Style::ClosingBackground);
+    setKBgColor(0xFF000000);
+    setTBgColor(0xFF000000);
+    setSBgColor(0xFF000000);
     setMouseEvent(_ret1ME);
     setKeyboardEvent(_ret1TE);
-    setRBreite(1);
-    setRFarbe(0xFFFFFFFF);
+    setRWidth(1);
+    setRColor(0xFFFFFFFF);
     setTitel("");
-    setTFontZ(schrift);
-    setTSFarbe(0xFFFFFFFF);
+    setTFontZ(font);
+    setTSColor(0xFFFFFFFF);
     zTTextField()->setSize(0, 20);
-    zTTextField()->addStyle(TextField::Style::Sichtbar | TextField::Style::Center
+    zTTextField()->addStyle(TextField::Style::Visible | TextField::Style::Center
                            | TextField::Style::Border);
-    setTRFarbe(0xFF00FF00);
-    setTRBreite(1);
-    setTAfFarbe(0x1000FF00);
+    setTRColor(0xFF00FF00);
+    setTRWidth(1);
+    setTAfColor(0x1000FF00);
     setTAfStrength(-15);
-    setSKAfFarbe(0xFF00FF00);
+    setSKAfColor(0xFF00FF00);
     setSKAfStrength(30);
     setClosingMe([this](void* p, void* o, MouseEvent me) {
-        if (me.id == ME_RLinks) removeStyle(Window::Style::Sichtbar);
+        if (me.id == ME_RLeft) removeStyle(Window::Style::Visible);
         return 1;
     });
 }
@@ -42,20 +42,20 @@ UIDialog::~UIDialog() {}
 
 void UIDialog::adjustSize()
 {
-    Punkt max = Punkt(0, 0);
+    Point max = Point(0, 0);
     for (Drawable* z : getMembers())
     {
-        if (z->hatStyle(Drawable::Style::Sichtbar))
+        if (z->hasStyle(Drawable::Style::Visible))
         {
-            max.x = MAX(max.x, z->getX() + z->getBreite() + 5);
+            max.x = MAX(max.x, z->getX() + z->getWidth() + 5);
             max.y = MAX(max.y, z->getY() + z->getHeight() + 5);
         }
     }
     setSize(
         max
-        + Punkt(hatStyle(Window::Style::Border) ? getRBreite() * 2 : 0,
-            (hatStyle(Window::Style::Border) ? getRBreite() * 2 : 0)
-                + (hatStyle(Window::Style::Titel) ? zTTextField()->getHeight()
+        + Point(hasStyle(Window::Style::Border) ? getRWidth() * 2 : 0,
+            (hasStyle(Window::Style::Border) ? getRWidth() * 2 : 0)
+                + (hasStyle(Window::Style::Title) ? zTTextField()->getHeight()
                                                    : 0)));
 }
 
@@ -83,24 +83,24 @@ void UIDialog::removeAll()
 }
 
 UIMessageDialog::UIMessageDialog(
-    const char* titel, const char* message, Font* schrift)
-    : UIDialog(schrift)
+    const char* title, const char* message, Font* font)
+    : UIDialog(font)
 {
-    setTitel(titel);
-    UIInit init = defaultUI(schrift, 0);
+    setTitel(title);
+    UIInit init = defaultUI(font, 0);
     TextField* msg = init.createTextField(init.initParam);
     msg->setStyle(TextField::Style::Text);
     msg->setText(message);
     msg->setPosition(5, 5);
-    TextRenderer tr(dynamic_cast<Font*>(schrift->getThis()));
-    tr.textFormatieren(msg->zText(), 590);
-    int br = tr.getTextBreite(message);
+    TextRenderer tr(dynamic_cast<Font*>(font->getThis()));
+    tr.formatText(msg->zText(), 590);
+    int br = tr.getTextWidth(message);
     int hoe = tr.getTextHeight(message);
     msg->setSize(br, hoe);
     Button* ok = init.createButton(init.initParam);
     ok->setText("Ok");
     ok->setMouseEvent([this](void* p, void* o, MouseEvent me) {
-        if (me.id == ME_RLinks) removeStyle(Window::Style::Sichtbar);
+        if (me.id == ME_RLeft) removeStyle(Window::Style::Visible);
         return 1;
     });
     ok->setPosition(br - 100, hoe + 5);

UIDialog.h

@@ -10,7 +10,7 @@ namespace Framework
         DLLEXPORT void adjustSize();
 
     public:
-        DLLEXPORT UIDialog(Font* schrift);
+        DLLEXPORT UIDialog(Font* font);
         DLLEXPORT virtual ~UIDialog();
         //! Adds a drawing to the window
         //! \param obj The drawing
@@ -26,7 +26,7 @@ namespace Framework
     {
     public:
         DLLEXPORT UIMessageDialog(
-            const char* titel, const char* message, Font* schrift);
+            const char* title, const char* message, Font* font);
         DLLEXPORT virtual ~UIMessageDialog();
     };
 

UIInitialization.cpp

@@ -22,21 +22,21 @@ SelectionBox* createSelectionBox(const UIInitParam& p)
 {
     SelectionBox* ret = new SelectionBox();
     ret->setStyle(SelectionBox::Style::Normal);
-    ret->setHintergrundFarbe(0xFF000000);
+    ret->setBackgroundColor(0xFF000000);
     ret->setMouseEvent(_ret1ME);
-    if (p.schrift)
-        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
+    if (p.font)
+        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
     ret->setMaxAuskappHeight(100);
-    ret->setMausRahmenBreite(1);
-    ret->setMausRahmenFarbe(0xFF005500);
+    ret->setMouseBorderWidth(1);
+    ret->setMouseBorderColor(0xFF005500);
     ret->setMouseAlphaFieldColor(0x00008700);
-    ret->setMausAlphaFeldStrength(-8);
-    ret->setAuswRahmenBreite(1);
-    ret->setAuswRahmenFarbe(0xFF00FF00);
+    ret->setMouseAlphaFieldStrength(-8);
+    ret->setSelBorderWidth(1);
+    ret->setSelBorderColor(0xFF00FF00);
     ret->setSelAlphaFieldColor(0x0000FF00);
-    ret->setAuswAlphaFeldStrength(-8);
+    ret->setSelAlphaFieldStrength(-8);
     return ret;
 }
 
@@ -44,17 +44,17 @@ SelectionList* createSelectionList(const UIInitParam& p)
 {
     SelectionList* ret = new SelectionList();
     ret->setStyle(SelectionList::Style::Normal);
-    if (p.schrift)
-        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
+    if (p.font)
+        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setAlphaFieldColor(0x5500FF00);
     ret->setAlphaFieldStrength(-5);
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
-    ret->setHintergrundFarbe(0xFF000000);
+    ret->setBackgroundColor(0xFF000000);
     ret->setMouseEvent(_ret1ME);
-    ret->setALRBreite(1);
-    ret->setALRFarbe(0xFF00FF00);
-    ret->setAAFFarbe(0x0000FF00);
+    ret->setALRWidth(1);
+    ret->setALRColor(0xFF00FF00);
+    ret->setAAFColor(0x0000FF00);
     ret->setAAFStrength(-8);
     ret->update();
     return ret;
@@ -73,9 +73,9 @@ ProgressBar* createProgressBar(const UIInitParam& p)
 {
     ProgressBar* ret = new ProgressBar();
     ret->setStyle(ProgressBar::Style::normal);
-    if (p.schrift)
-        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
-    ret->setSFarbe(0xFFFFFFFF);
+    if (p.font)
+        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    ret->setSColor(0xFFFFFFFF);
     ret->setSSize(12);
     ret->setBorderColor(0xFFFFFFFF);
     ret->setBorderWidth(1);
@@ -83,14 +83,14 @@ ProgressBar* createProgressBar(const UIInitParam& p)
     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"));
-    ret->setHintergrundImageZ(fbhb);
-    Image* fbfhb = datei->laden(0, new Text("fortschrittvol"));
+    datei->readData(0);
+    Image* fbhb = datei->load(0, new Text("fortschrittleh"));
+    ret->setBackgroundImageZ(fbhb);
+    Image* fbfhb = datei->load(0, new Text("fortschrittvol"));
     datei->release();
     ret->setFBgImageZ(fbfhb);
 #endif
-    ret->setFBgFarbe(0xFF00FF00);
+    ret->setFBgColor(0xFF00FF00);
     return ret;
 }
 
@@ -107,21 +107,21 @@ Window* createWindow(const UIInitParam& p)
     ret->setMouseEvent(_ret1ME);
     ret->setKeyboardEvent(_ret1TE);
     ret->setStyle(Window::Style::normal);
-    ret->setRBreite(1);
-    ret->setRFarbe(0xFFFFFFFF);
+    ret->setRWidth(1);
+    ret->setRColor(0xFFFFFFFF);
     ret->setTitel("");
-    if (p.schrift)
-        ret->setTFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
-    ret->setTSFarbe(0xFFFFFFFF);
+    if (p.font)
+        ret->setTFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    ret->setTSColor(0xFFFFFFFF);
     ret->zTTextField()->setSize(0, 20);
-    ret->zTTextField()->addStyle(TextField::Style::Sichtbar
+    ret->zTTextField()->addStyle(TextField::Style::Visible
                                 | TextField::Style::Center
                                 | TextField::Style::Border);
-    ret->setTRFarbe(0xFF00FF00);
-    ret->setTRBreite(1);
-    ret->setTAfFarbe(0x1000FF00);
+    ret->setTRColor(0xFF00FF00);
+    ret->setTRWidth(1);
+    ret->setTAfColor(0x1000FF00);
     ret->setTAfStrength(-15);
-    ret->setSKAfFarbe(0xFF00FF00);
+    ret->setSKAfColor(0xFF00FF00);
     ret->setSKAfStrength(30);
     return ret;
 }
@@ -129,8 +129,8 @@ Window* createWindow(const UIInitParam& p)
 Button* createButton(const UIInitParam& p)
 {
     Button* ret = new Button();
-    if (p.schrift)
-        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
+    if (p.font)
+        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setStyle(Button::Style::Normal);
     return ret;
 }
@@ -140,9 +140,9 @@ CheckBox* createCheckBox(const UIInitParam& p)
     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);
+    if (p.font)
+        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    ret->setSColor(0xFFFFFFFF);
     ret->setSSize(12);
     ret->setAlphaFieldColor(0x5500FF00);
     ret->setAlphaFieldStrength(-5);
@@ -159,14 +159,14 @@ BarDiagram* createBarDiagram(const UIInitParam& p)
 {
     BarDiagram* ret = new BarDiagram();
     ret->setStyle(BarDiagram::Style::normal);
-    if (p.schrift)
-        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
+    if (p.font)
+        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
-    ret->setDatenRahmenBreite(1);
-    ret->setDatenRahmenFarbe(0xFFFFFFFF);
-    ret->setHintergrundFarbe(0xFF000000);
-    ret->setDatenHintergrundFarbe(0xFF000000);
+    ret->setDataBorderWidth(1);
+    ret->setDataBorderColor(0xFFFFFFFF);
+    ret->setBackgroundColor(0xFF000000);
+    ret->setDataBackgroundColor(0xFF000000);
     return ret;
 }
 
@@ -195,10 +195,10 @@ TextField* createTextField(const UIInitParam& p)
 {
     TextField* ret = new TextField();
     ret->setStyle(TextField::Style::Text);
-    if (p.schrift)
-        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
-    ret->setSchriftFarbe(0xFFFFFFFF);
-    ret->setSchriftSize(12);
+    if (p.font)
+        ret->setFontZ(dynamic_cast<Font*>(p.font->getThis()));
+    ret->setFontColor(0xFFFFFFFF);
+    ret->setFontSize(12);
     ret->setAlphaFieldColor(0x5500FF00);
     ret->setAlphaFieldStrength(-5);
     ret->setBorderWidth(1);
@@ -213,10 +213,10 @@ ObjTable* createObjTable(const UIInitParam& p)
     ret->setMouseEvent(_ret1ME);
     ret->setBorderWidth(1);
     ret->setBorderColor(0xFFFFFFFF);
-    ret->setRasterBreite(1);
-    ret->setRasterFarbe(0xFFFFFFFF);
-    ret->setVertikalKlickScroll(5);
-    ret->setHorizontalKlickScroll(5);
+    ret->setGridWidth(1);
+    ret->setGridColor(0xFFFFFFFF);
+    ret->setVerticalClickScroll(5);
+    ret->setHorizontalClickScroll(5);
     return ret;
 }
 
@@ -237,7 +237,7 @@ UIMLView* createUIMLView(const UIInitParam& p)
 UIInit Framework::defaultUI(Font* zFont, Screen* zScreen)
 {
     UIInit uii;
-    uii.initParam.schrift = zFont;
+    uii.initParam.font = zFont;
     uii.initParam.bildschirm = zScreen;
     uii.initParam.data = 0;
     uii.createSelectionBox = createSelectionBox;

UIInitialization.h

@@ -27,7 +27,7 @@ namespace Framework
 
     struct UIInitParam
     {
-        Font* schrift;
+        Font* font;
         Screen* bildschirm;
         void* data;
     };

UIMLView.cpp

@@ -27,7 +27,7 @@ void UIMLElement::layout(XML::Element& element,
     int pHeight,
     UIMLContainer& generalLayouter)
 {
-    int width = z.getBreite();
+    int width = z.getWidth();
     int height = z.getHeight();
     if (element.hasAttribute("style"))
     {
@@ -36,7 +36,7 @@ void UIMLElement::layout(XML::Element& element,
     if (element.hasAttribute("width"))
     {
         Text w = element.getAttributeValue("width");
-        if (!w.istGleich("auto"))
+        if (!w.isEqual("auto"))
         {
             width = calculateSize(w, pWidth);
         }
@@ -44,7 +44,7 @@ void UIMLElement::layout(XML::Element& element,
     if (element.hasAttribute("height"))
     {
         Text h = element.getAttributeValue("height");
-        if (!h.istGleich("auto"))
+        if (!h.isEqual("auto"))
         {
             height = calculateSize(h, pHeight);
         }
@@ -54,11 +54,11 @@ void UIMLElement::layout(XML::Element& element,
     {
         Text la = element.getAttributeValue("align-x");
         int x = 0;
-        if (la.istGleich("start"))
+        if (la.isEqual("start"))
             x = 0;
-        else if (la.istGleich("end"))
+        else if (la.isEqual("end"))
             x = pWidth;
-        else if (la.istGleich("center"))
+        else if (la.isEqual("center"))
             x = pWidth / 2 - width / 2;
         else
         {
@@ -86,11 +86,11 @@ void UIMLElement::layout(XML::Element& element,
     {
         Text la = element.getAttributeValue("align-left");
         int x = 0;
-        if (la.istGleich("start"))
+        if (la.isEqual("start"))
             x = 0;
-        else if (la.istGleich("end"))
+        else if (la.isEqual("end"))
             x = pWidth;
-        else if (la.istGleich("center"))
+        else if (la.isEqual("center"))
             x = pWidth / 2 - width / 2;
         else
         {
@@ -104,7 +104,7 @@ void UIMLElement::layout(XML::Element& element,
                     pHeight,
                     generalLayouter);
                 Drawable* laz = generalLayouter.zDrawableById(la);
-                if (laz) x = laz->getX() + laz->getBreite();
+                if (laz) x = laz->getX() + laz->getWidth();
             }
         }
         if (element.hasAttribute("margin-left"))
@@ -118,11 +118,11 @@ void UIMLElement::layout(XML::Element& element,
     {
         Text ra = element.getAttributeValue("align-right");
         int x = 0;
-        if (ra.istGleich("start"))
-            x = -z.getBreite();
-        else if (ra.istGleich("end"))
-            x = pWidth - z.getBreite();
-        else if (ra.istGleich("center"))
+        if (ra.isEqual("start"))
+            x = -z.getWidth();
+        else if (ra.isEqual("end"))
+            x = pWidth - z.getWidth();
+        else if (ra.isEqual("center"))
             x = pWidth / 2 - width / 2;
         else
         {
@@ -136,7 +136,7 @@ void UIMLElement::layout(XML::Element& element,
                     pHeight,
                     generalLayouter);
                 Drawable* raz = generalLayouter.zDrawableById(ra);
-                if (raz) x = raz->getX() - z.getBreite();
+                if (raz) x = raz->getX() - z.getWidth();
             }
         }
         if (element.hasAttribute("margin-right"))
@@ -150,11 +150,11 @@ void UIMLElement::layout(XML::Element& element,
     {
         Text ta = element.getAttributeValue("align-y");
         int y = 0;
-        if (ta.istGleich("start"))
+        if (ta.isEqual("start"))
             y = 0;
-        else if (ta.istGleich("end"))
+        else if (ta.isEqual("end"))
             y = pHeight;
-        else if (ta.istGleich("center"))
+        else if (ta.isEqual("center"))
             y = pHeight / 2 - height / 2;
         else
         {
@@ -182,11 +182,11 @@ void UIMLElement::layout(XML::Element& element,
     {
         Text ta = element.getAttributeValue("align-top");
         int y = 0;
-        if (ta.istGleich("start"))
+        if (ta.isEqual("start"))
             y = 0;
-        else if (ta.istGleich("end"))
+        else if (ta.isEqual("end"))
             y = pHeight;
-        else if (ta.istGleich("center"))
+        else if (ta.isEqual("center"))
             y = pHeight / 2 - height / 2;
         else
         {
@@ -214,11 +214,11 @@ void UIMLElement::layout(XML::Element& element,
     {
         Text ba = element.getAttributeValue("align-bottom");
         int y = 0;
-        if (ba.istGleich("start"))
+        if (ba.isEqual("start"))
             y = -z.getHeight();
-        else if (ba.istGleich("end"))
+        else if (ba.isEqual("end"))
             y = pHeight - z.getHeight();
-        else if (ba.istGleich("center"))
+        else if (ba.isEqual("center"))
             y = pHeight / 2 - height / 2;
         else
         {
@@ -270,7 +270,7 @@ void UIMLElement::layout(XML::Element& element,
         }
     }
     // recursive layout
-    pWidth = z.getInnenBreite();
+    pWidth = z.getInnerWidth();
     pHeight = z.getInnenHeight();
     for (auto i : getChildren(element))
     {
@@ -290,7 +290,7 @@ int Framework::UIMLElement::calculateSize(Text attributeValue, int parentSize)
 {
     attributeValue.removeWhitespaceAfter(0);
     attributeValue.removeWhitespaceBefore(attributeValue.getLength());
-    if (attributeValue.hat('('))
+    if (attributeValue.has('('))
     {
         int start = -1;
         int len = attributeValue.getLength();
@@ -310,10 +310,10 @@ int Framework::UIMLElement::calculateSize(Text attributeValue, int parentSize)
         }
         return 0;
     }
-    else if (attributeValue.hat('*') || attributeValue.hat('/'))
+    else if (attributeValue.has('*') || attributeValue.has('/'))
     {
-        int posD = attributeValue.positionVon('/');
-        int posM = attributeValue.positionVon('*');
+        int posD = attributeValue.positionOf('/');
+        int posM = attributeValue.positionOf('*');
         if ((posD >= 0 && posD < posM) || posM < 0)
         {
             Text* firstPart = attributeValue.getTeilText(0, posD);
@@ -335,10 +335,10 @@ int Framework::UIMLElement::calculateSize(Text attributeValue, int parentSize)
             return first * second;
         }
     }
-    else if (attributeValue.hat('+') || attributeValue.hat('-'))
+    else if (attributeValue.has('+') || attributeValue.has('-'))
     {
-        int posP = attributeValue.positionVon('+');
-        int posN = attributeValue.positionVon('-');
+        int posP = attributeValue.positionOf('+');
+        int posN = attributeValue.positionOf('-');
         if ((posP >= 0 && posP < posN) || posN < 0)
         {
             Text* firstPart = attributeValue.getTeilText(0, posP);
@@ -360,7 +360,7 @@ int Framework::UIMLElement::calculateSize(Text attributeValue, int parentSize)
             return first - second;
         }
     }
-    else if (attributeValue.hatAt(attributeValue.getLength() - 1, "%"))
+    else if (attributeValue.hasAt(attributeValue.getLength() - 1, "%"))
     {
         return (int)((int)attributeValue * (parentSize / 100.0));
     }
@@ -387,7 +387,7 @@ UIMLTextField::UIMLTextField()
 
 bool UIMLTextField::isApplicableFor(XML::Element& element)
 {
-    return element.getName().istGleich("textfield");
+    return element.getName().isEqual("textfield");
 }
 
 Drawable* UIMLTextField::parseElement(
@@ -425,14 +425,14 @@ void UIMLTextField::layout(XML::Element& element,
     TextField* tf = dynamic_cast<TextField*>(&z);
     if (element.hasAttribute("font-size"))
     {
-        tf->setSchriftSize(
+        tf->setFontSize(
             (unsigned char)(int)element.getAttributeValue("font-size"));
     }
     ((TextField*)&z)->setText(element.getText());
     if (element.hasAttribute("width"))
     {
         Text w = element.getAttributeValue("width");
-        if (w.istGleich("auto"))
+        if (w.isEqual("auto"))
         {
             z.setWidth(((TextField*)&z)->getNeededWidth());
         }
@@ -440,38 +440,38 @@ void UIMLTextField::layout(XML::Element& element,
     if (element.hasAttribute("height"))
     {
         Text h = element.getAttributeValue("height");
-        if (h.istGleich("auto"))
+        if (h.isEqual("auto"))
         {
             z.setHeight(((TextField*)&z)->getNeededHeight());
         }
     }
     if (element.hasAttribute("text-color"))
     {
-        tf->setSchriftFarbe((int)element.getAttributeValue("text-color"));
+        tf->setFontColor((int)element.getAttributeValue("text-color"));
     }
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
     if (element.hasAttribute("text-align-horizontal"))
         z.setStyle(TextField::Style::HCenter,
             element.getAttributeValue("text-align-horizontal")
-                .istGleich("center"));
+                .isEqual("center"));
     if (element.hasAttribute("text-align-vertical"))
         z.setStyle(TextField::Style::VCenter,
             element.getAttributeValue("text-align-vertical")
-                .istGleich("center"));
+                .isEqual("center"));
     if (element.hasAttribute("disabled"))
         z.removeStyle(TextField::Style::Editierbar);
-    if (element.getAttributeValue("vScroll").istGleich("auto"))
+    if (element.getAttributeValue("vScroll").isEqual("auto"))
     {
         tf->setStyle(TextField::Style::VScroll,
             tf->getNeededHeight() > tf->getInnenHeight());
-        tf->setVertikalKlickScroll(tf->getSchriftSize());
+        tf->setVerticalClickScroll(tf->getFontSize());
         tf->updateVScroll();
     }
-    if (element.getAttributeValue("hScroll").istGleich("auto"))
+    if (element.getAttributeValue("hScroll").isEqual("auto"))
     {
         tf->setStyle(TextField::Style::HScroll,
-            tf->getNeededWidth() > tf->getInnenBreite());
-        tf->setHorizontalKlickScroll(tf->getSchriftSize());
+            tf->getNeededWidth() > tf->getInnerWidth());
+        tf->setHorizontalClickScroll(tf->getFontSize());
         tf->updateHScroll();
     }
 }
@@ -482,7 +482,7 @@ UIMLButton::UIMLButton()
 
 bool UIMLButton::isApplicableFor(XML::Element& element)
 {
-    return element.getName().istGleich("button");
+    return element.getName().isEqual("button");
 }
 
 Drawable* UIMLButton::parseElement(
@@ -517,7 +517,7 @@ void UIMLButton::layout(XML::Element& element,
 {
     if (element.hasAttribute("font-size"))
         ((Button*)&z)
-            ->setSchriftSize(
+            ->setFontSize(
                 (unsigned char)(int)element.getAttributeValue("font-size"));
     ((Button*)&z)->setText(element.getText());
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
@@ -529,7 +529,7 @@ UIMLCheck::UIMLCheck()
 
 bool UIMLCheck::isApplicableFor(XML::Element& element)
 {
-    return element.getName().istGleich("check");
+    return element.getName().isEqual("check");
 }
 
 Drawable* UIMLCheck::parseElement(
@@ -579,7 +579,7 @@ UIMLText::UIMLText()
 
 bool UIMLText::isApplicableFor(XML::Element& element)
 {
-    return element.getName().istGleich("text");
+    return element.getName().isEqual("text");
 }
 
 Drawable* UIMLText::parseElement(
@@ -617,14 +617,14 @@ void UIMLText::layout(XML::Element& element,
     TextField* tf = dynamic_cast<TextField*>(&z);
     if (element.hasAttribute("font-size"))
     {
-        tf->setSchriftSize(
+        tf->setFontSize(
             (unsigned char)(int)element.getAttributeValue("font-size"));
     }
     tf->setText(element.getText());
     if (element.hasAttribute("width"))
     {
         Text w = element.getAttributeValue("width");
-        if (w.istGleich("auto"))
+        if (w.isEqual("auto"))
         {
             z.setWidth(tf->getNeededWidth());
         }
@@ -632,38 +632,38 @@ void UIMLText::layout(XML::Element& element,
     if (element.hasAttribute("height"))
     {
         Text h = element.getAttributeValue("height");
-        if (h.istGleich("auto"))
+        if (h.isEqual("auto"))
         {
             z.setHeight(tf->getNeededHeight());
         }
     }
     if (element.hasAttribute("text-color"))
     {
-        tf->setSchriftFarbe((int)element.getAttributeValue("text-color"));
+        tf->setFontColor((int)element.getAttributeValue("text-color"));
     }
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
     if (element.hasAttribute("text-align-horizontal"))
         z.setStyle(TextField::Style::HCenter,
             element.getAttributeValue("text-align-horizontal")
-                .istGleich("center"));
+                .isEqual("center"));
     if (element.hasAttribute("text-align-vertical"))
         z.setStyle(TextField::Style::VCenter,
             element.getAttributeValue("text-align-vertical")
-                .istGleich("center"));
+                .isEqual("center"));
     if (element.hasAttribute("disabled"))
         z.removeStyle(TextField::Style::Editierbar);
-    if (element.getAttributeValue("vScroll").istGleich("auto"))
+    if (element.getAttributeValue("vScroll").isEqual("auto"))
     {
         tf->setStyle(TextField::Style::VScroll,
             tf->getNeededHeight() > tf->getInnenHeight());
-        tf->setVertikalKlickScroll(tf->getSchriftSize());
+        tf->setVerticalClickScroll(tf->getFontSize());
         tf->updateVScroll();
     }
-    if (element.getAttributeValue("hScroll").istGleich("auto"))
+    if (element.getAttributeValue("hScroll").isEqual("auto"))
     {
         tf->setStyle(TextField::Style::HScroll,
-            tf->getNeededWidth() > tf->getInnenBreite());
-        tf->setHorizontalKlickScroll(tf->getSchriftSize());
+            tf->getNeededWidth() > tf->getInnerWidth());
+        tf->setHorizontalClickScroll(tf->getFontSize());
         tf->updateHScroll();
     }
 }
@@ -674,7 +674,7 @@ UIMLTextArea::UIMLTextArea()
 
 bool UIMLTextArea::isApplicableFor(XML::Element& element)
 {
-    return element.getName().istGleich("textarea");
+    return element.getName().isEqual("textarea");
 }
 
 Drawable* UIMLTextArea::parseElement(
@@ -712,17 +712,17 @@ void UIMLTextArea::layout(XML::Element& element,
     TextField* tf = dynamic_cast<TextField*>(&z);
     if (element.hasAttribute("font-size"))
     {
-        tf->setSchriftSize(
+        tf->setFontSize(
             (unsigned char)(int)element.getAttributeValue("font-size"));
     }
     if (element.hasAttribute("disabled"))
         z.removeStyle(TextField::Style::Editierbar);
     tf->setText(element.getText());
-    tf->zTextRenderer()->textFormatieren(tf->zText(), z.getInnenBreite());
+    tf->zTextRenderer()->formatText(tf->zText(), z.getInnerWidth());
     if (element.hasAttribute("width"))
     {
         Text w = element.getAttributeValue("width");
-        if (w.istGleich("auto"))
+        if (w.isEqual("auto"))
         {
             z.setWidth(((TextField*)&z)->getNeededWidth());
         }
@@ -730,37 +730,37 @@ void UIMLTextArea::layout(XML::Element& element,
     if (element.hasAttribute("height"))
     {
         Text h = element.getAttributeValue("height");
-        if (h.istGleich("auto"))
+        if (h.isEqual("auto"))
         {
             z.setHeight(((TextField*)&z)->getNeededHeight());
         }
     }
     if (element.hasAttribute("text-color"))
     {
-        tf->setSchriftFarbe((int)element.getAttributeValue("text-color"));
+        tf->setFontColor((int)element.getAttributeValue("text-color"));
     }
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
     if (element.hasAttribute("text-align-horizontal"))
         z.setStyle(TextField::Style::HCenter,
             element.getAttributeValue("text-align-horizontal")
-                .istGleich("center"));
+                .isEqual("center"));
     if (element.hasAttribute("text-align-vertical"))
         z.setStyle(TextField::Style::VCenter,
             element.getAttributeValue("text-align-vertical")
-                .istGleich("center"));
+                .isEqual("center"));
     if (element.hasAttribute("font-size"))
-        if (element.getAttributeValue("vScroll").istGleich("auto"))
+        if (element.getAttributeValue("vScroll").isEqual("auto"))
         {
             tf->setStyle(TextField::Style::VScroll,
                 tf->getNeededHeight() > tf->getInnenHeight());
-            tf->setVertikalKlickScroll(tf->getSchriftSize());
+            tf->setVerticalClickScroll(tf->getFontSize());
             tf->updateVScroll();
         }
-    if (element.getAttributeValue("hScroll").istGleich("auto"))
+    if (element.getAttributeValue("hScroll").isEqual("auto"))
     {
         tf->setStyle(TextField::Style::HScroll,
-            tf->getNeededWidth() > tf->getInnenBreite());
-        tf->setHorizontalKlickScroll(tf->getSchriftSize());
+            tf->getNeededWidth() > tf->getInnerWidth());
+        tf->setHorizontalClickScroll(tf->getFontSize());
         tf->updateHScroll();
     }
 }
@@ -771,7 +771,7 @@ UIMLTable::UIMLTable()
 
 bool UIMLTable::isApplicableFor(XML::Element& element)
 {
-    return element.getName().istGleich("table");
+    return element.getName().isEqual("table");
 }
 
 Drawable* UIMLTable::parseElement(
@@ -802,14 +802,14 @@ DLLEXPORT bool Framework::UIMLTable::updateElement(
             id = currentId + "_tr_" + index++;
             i->setAttribute("id", id);
         }
-        if (i->getName().istGleich("tr"))
+        if (i->getName().isEqual("tr"))
         {
-            if (t->getZeilenNummer(id) == -1) t->addZeile(id);
-            t->setZeilePosition(id, linePos);
+            if (t->getRowNumber(id) == -1) t->addRow(id);
+            t->setRowPosition(id, linePos);
             int c = 1;
             for (auto j = i->getChilds(); j; j++)
             {
-                if (t->getSpaltenAnzahl() < c) t->addSpalte(Text(c - 1));
+                if (t->getColumnCount() < c) t->addColumn(Text(c - 1));
                 if (numCols < c) numCols = c;
                 Drawable* z = t->zDrawable(Text(c - 1), id);
                 if (!z
@@ -819,10 +819,10 @@ DLLEXPORT bool Framework::UIMLTable::updateElement(
                     z = generalFactory.parseElement(*j.val(), generalFactory);
                     if (z)
                     {
-                        if (z->getBreite() > t->getSpaltenBreite(Text(c - 1)))
-                            t->setSpaltenBreite(Text(c - 1), z->getBreite());
-                        if (z->getHeight() > t->getZeilenHeight(Text(id)))
-                            t->setZeilenHeight(Text(id), z->getHeight());
+                        if (z->getWidth() > t->getColumnWidth(Text(c - 1)))
+                            t->setColumnWidth(Text(c - 1), z->getWidth());
+                        if (z->getHeight() > t->getRowHeight(Text(id)))
+                            t->setRowHeight(Text(id), z->getHeight());
                         t->setDrawableZ(Text(c - 1), id, z);
                     }
                 }
@@ -831,19 +831,19 @@ DLLEXPORT bool Framework::UIMLTable::updateElement(
         }
         linePos++;
     }
-    for (int i = 0; i < t->getZeilenAnzahl(); i++)
+    for (int i = 0; i < t->getRowCount(); i++)
     { // remove all lines that are not in the xml
         if (!element.selectChildsByName("tr")
-                .whereAttributeEquals("id", *t->zZeilenName(i))
+                .whereAttributeEquals("id", *t->zRowName(i))
                 .exists())
         {
-            t->removeZeile(i);
+            t->removeRow(i);
             i--;
         }
     }
-    for (int i = numCols; i < t->getSpaltenAnzahl(); i++)
+    for (int i = numCols; i < t->getColumnCount(); i++)
     { // remove all columns that are not in the xml
-        t->removeSpalte(i);
+        t->removeColumn(i);
         i--;
     }
     if (!element.hasAttribute("style"))
@@ -865,26 +865,26 @@ void UIMLTable::layout(XML::Element& element,
     if (element.hasAttribute("scroll"))
     {
         z.setStyle(ObjTable::Style::HScroll,
-            element.getAttributeValue("scroll").istGleich("horizontal"));
+            element.getAttributeValue("scroll").isEqual("horizontal"));
         z.setStyle(ObjTable::Style::VScroll,
-            element.getAttributeValue("scroll").istGleich("vertical"));
+            element.getAttributeValue("scroll").isEqual("vertical"));
         z.setStyle(ObjTable::Style::scroll,
-            element.getAttributeValue("scroll").istGleich("both"));
+            element.getAttributeValue("scroll").isEqual("both"));
     }
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
     ObjTable* objT = (ObjTable*)&z;
-    if (objT->getZeilenAnzahl() > 0)
+    if (objT->getRowCount() > 0)
     {
         if (element.hasAttribute("line-height"))
         {
             int height = (int)element.getAttributeValue("line-height");
-            for (int i = 0; i < objT->getZeilenAnzahl(); i++)
-                objT->setZeilenHeight(i, height);
+            for (int i = 0; i < objT->getRowCount(); i++)
+                objT->setRowHeight(i, height);
         }
-        for (int i = 0; i < objT->getSpaltenAnzahl(); i++)
+        for (int i = 0; i < objT->getColumnCount(); i++)
         {
             if (objT->zDrawable(i, 0))
-                objT->setSpaltenBreite(i, objT->zDrawable(i, 0)->getBreite());
+                objT->setColumnWidth(i, objT->zDrawable(i, 0)->getWidth());
         }
     }
 }
@@ -900,7 +900,7 @@ UIMLFrame::UIMLFrame()
 
 bool UIMLFrame::isApplicableFor(XML::Element& element)
 {
-    return element.getName().istGleich("frame");
+    return element.getName().isEqual("frame");
 }
 
 Drawable* UIMLFrame::parseElement(
@@ -969,23 +969,23 @@ void UIMLFrame::layout(XML::Element& element,
         f->setTitel(element.getAttributeValue("title"));
     if (element.hasAttribute("title-height"))
     {
-        f->zTTextField()->setSize(f->zTTextField()->getBreite(),
+        f->zTTextField()->setSize(f->zTTextField()->getWidth(),
             (int)element.getAttributeValue("title-height"));
     }
     if (element.hasAttribute("title-font-size"))
     {
-        f->zTTextField()->setSchriftSize(
+        f->zTTextField()->setFontSize(
             (unsigned char)(int)element.getAttributeValue("title-font-size"));
     }
     if (element.hasAttribute("title-text-color"))
     {
-        f->zTTextField()->setSchriftFarbe(
+        f->zTTextField()->setFontColor(
             (int)element.getAttributeValue("title-text-color"));
     }
     if (element.hasAttribute("width"))
     {
         Text w = element.getAttributeValue("width");
-        if (w.istGleich("auto"))
+        if (w.isEqual("auto"))
         {
             z.setWidth(f->getNeededChildWidth());
         }
@@ -993,7 +993,7 @@ void UIMLFrame::layout(XML::Element& element,
     if (element.hasAttribute("height"))
     {
         Text h = element.getAttributeValue("height");
-        if (h.istGleich("auto"))
+        if (h.isEqual("auto"))
         {
             z.setHeight(f->getNeededChildHeight());
         }
@@ -1005,7 +1005,7 @@ void UIMLFrame::layout(XML::Element& element,
             pWidth,
             pHeight,
             generalLayouter); // calculate all sizes
-        if (element.getAttributeValue("display").istGleich("column"))
+        if (element.getAttributeValue("display").isEqual("column"))
         {
             int gap = calculateSize(element.getAttributeValue("gap"), pHeight);
             int y = 0;
@@ -1027,7 +1027,7 @@ void UIMLFrame::layout(XML::Element& element,
                 }
             }
         }
-        else if (element.getAttributeValue("display").istGleich("row"))
+        else if (element.getAttributeValue("display").isEqual("row"))
         {
             int gap = calculateSize(element.getAttributeValue("gap"), pWidth);
             int x = 0;
@@ -1044,7 +1044,7 @@ void UIMLFrame::layout(XML::Element& element,
                         && !child.whereAttributeExists("align-bottom").exists())
                     {
                         z->setX(x);
-                        x += z->getBreite() + gap;
+                        x += z->getWidth() + gap;
                     }
                 }
             }
@@ -1055,17 +1055,17 @@ void UIMLFrame::layout(XML::Element& element,
         pWidth,
         pHeight,
         generalLayouter); // calculate all remaining positions
-    if (element.getAttributeValue("vScroll").istGleich("auto"))
+    if (element.getAttributeValue("vScroll").isEqual("auto"))
     {
         f->setStyle(Window::Style::VScroll,
             f->getNeededChildHeight() > f->getInnenHeight());
         f->setVSBScroll(10);
         f->updateVScroll();
     }
-    if (element.getAttributeValue("hScroll").istGleich("auto"))
+    if (element.getAttributeValue("hScroll").isEqual("auto"))
     {
         f->setStyle(Window::Style::HScroll,
-            f->getNeededChildWidth() > f->getInnenBreite());
+            f->getNeededChildWidth() > f->getInnerWidth());
         f->setHSBScroll(10);
         f->updateHScroll();
     }
@@ -1076,7 +1076,7 @@ UIMLView::UIMLView()
     : DrawableBackground()
 {
     style = Style::MEIgnoreInside | Style::MEIgnoreParentInside
-          | Style::MEIgnoreSichtbar | Style::MEIgnoreVerarbeitet;
+          | Style::MEIgnoreVisible | Style::MEIgnoreProcessed;
     members = new RCTrie<Drawable>();
     dom = 0;
     nextId = 0;
@@ -1120,20 +1120,20 @@ void UIMLView::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (dom)
     {
-        bool verarbeitet = me.verarbeitet;
-        me.verarbeitet |= hatStyleNicht(Style::Sichtbar);
+        bool processed = me.processed;
+        me.processed |= hasStyleNot(Style::Visible);
         bool insideParent = me.insideParent;
-        if (!hatStyle(Style::Sichtbar) || !me.insideParent || me.verarbeitet
+        if (!hasStyle(Style::Visible) || !me.insideParent || me.processed
             || me.mx < 0 || me.my < 0 || me.mx >= gr.x || me.my >= gr.y
             || !userRet)
             me.insideParent = 0;
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
+        if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
         me.mx -= rbr;
         me.my -= rbr;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
             me.my += vertikalScrollBar->getScroll();
-        if (hatStyle(Style::HScroll) && horizontalScrollBar)
+        if (hasStyle(Style::HScroll) && horizontalScrollBar)
             me.mx += horizontalScrollBar->getScroll();
         if (dom)
         {
@@ -1146,17 +1146,17 @@ void UIMLView::doMouseEvent(MouseEvent& me, bool userRet)
         }
         me.mx += rbr;
         me.my += rbr;
-        if (hatStyle(Style::VScroll) && vertikalScrollBar)
+        if (hasStyle(Style::VScroll) && vertikalScrollBar)
             me.my -= vertikalScrollBar->getScroll();
-        if (hatStyle(Style::HScroll) && horizontalScrollBar)
+        if (hasStyle(Style::HScroll) && horizontalScrollBar)
             me.mx -= horizontalScrollBar->getScroll();
-        if (!hatStyle(Style::Sichtbar) || !me.insideParent || me.verarbeitet
+        if (!hasStyle(Style::Visible) || !me.insideParent || me.processed
             || me.mx < 0 || me.my < 0 || me.mx >= gr.x || me.my >= gr.y
             || !userRet)
             me.insideParent = insideParent;
         else
-            me.verarbeitet = 1;
-        if (hatStyleNicht(Style::Sichtbar)) me.verarbeitet = verarbeitet;
+            me.processed = 1;
+        if (hasStyleNot(Style::Visible)) me.processed = processed;
     }
 }
 
@@ -1177,7 +1177,7 @@ void Framework::UIMLView::setOnMemberKeyboardEvent(std::function<bool(
 //! removes all known elements that can be used in UIML
 void UIMLView::removeAllKnownElements()
 {
-    knownElements.leeren();
+    knownElements.clear();
 }
 
 //! adds a new known element that can then be used in UIML.
@@ -1278,7 +1278,7 @@ void UIMLView::layout()
             {
                 layout(*i.val(),
                     *z,
-                    this->getInnenBreite(),
+                    this->getInnerWidth(),
                     this->getInnenHeight(),
                     *this);
             }
@@ -1314,7 +1314,7 @@ Text UIMLView::addMember(Text uiml, Text parentId)
         XML::Editor ed2 = ed.whereAttributeEquals("id", parentId);
         if (ed2.begin())
         {
-            if (ed2.begin()->getName().istGleich("frame"))
+            if (ed2.begin()->getName().isEqual("frame"))
             {
                 Drawable* z = parseElement(*e, *this);
                 if (z)
@@ -1346,9 +1346,9 @@ void UIMLView::removeMember(Text id)
 //  te: The event
 void UIMLView::doKeyboardEvent(KeyboardEvent& te)
 {
-    bool verarbeitet = te.verarbeitet;
+    bool processed = te.processed;
     DrawableBackground::doKeyboardEvent(te);
-    te.verarbeitet = verarbeitet;
+    te.processed = processed;
     if (dom)
     {
         for (auto i = dom->getChilds(); i; i++)
@@ -1381,7 +1381,7 @@ bool UIMLView::tick(double tickVal)
 // Draws the background of a drawing to rObj
 void UIMLView::render(Image& rObj)
 {
-    if (hatStyle(Drawable::Style::Sichtbar))
+    if (hasStyle(Drawable::Style::Visible))
     {
         DrawableBackground::render(rObj);
         if (dom)
@@ -1391,8 +1391,8 @@ void UIMLView::render(Image& rObj)
                     gr.x + getBorderWidth() * 2,
                     gr.y + getBorderWidth() * 2))
                 return;
-            bool vSc = hatStyle(Style::VScroll) && vertikalScrollBar;
-            bool hSc = hatStyle(Style::HScroll) && horizontalScrollBar;
+            bool vSc = hasStyle(Style::VScroll) && vertikalScrollBar;
+            bool hSc = hasStyle(Style::HScroll) && horizontalScrollBar;
             rObj.addScrollOffset(hSc ? horizontalScrollBar->getScroll() : 0,
                 vSc ? vertikalScrollBar->getScroll() : 0);
             for (int i = dom->getChildCount() - 1; i >= 0; i--)
@@ -1465,8 +1465,8 @@ Drawable* UIMLView::parseElement(
             while (1)
             {
                 Text* t;
-                if (c.hat(","))
-                    t = c.getTeilText(0, c.positionVon(','));
+                if (c.has(","))
+                    t = c.getTeilText(0, c.positionOf(','));
                 else
                     t = new Text(c);
                 XML::Editor ce
@@ -1484,8 +1484,8 @@ Drawable* UIMLView::parseElement(
                     }
                 }
                 t->release();
-                if (c.hat(","))
-                    c.remove(0, c.positionVon(',' + 1));
+                if (c.has(","))
+                    c.remove(0, c.positionOf(',' + 1));
                 else
                     break;
             }
@@ -1510,7 +1510,7 @@ Drawable* UIMLView::parseElement(
         }
         if (z)
         {
-            if (hatStyle(Style::GlobalMouseEvent))
+            if (hasStyle(Style::GlobalMouseEvent))
             {
                 z->addMouseEvent(
                     [this, z](void* p, void* o, MouseEvent me) {
@@ -1527,7 +1527,7 @@ Drawable* UIMLView::parseElement(
                             .orElse(0);
                     });
             }
-            if (hatStyle(Style::GlobalTastaturEvent))
+            if (hasStyle(Style::GlobalTastaturEvent))
             {
                 z->addKeyboardEvent(
                     [this, z](void* p, void* o, KeyboardEvent te) {
@@ -1601,14 +1601,14 @@ void UIMLView::layout(XML::Element& element,
 
 Text Framework::UIMLView::getDrawableId(Drawable& z)
 {
-    int index = memberList.getWertIndex(&z);
+    int index = memberList.getValueIndex(&z);
     if (index >= 0) return *idList.z(index);
     return "";
 }
 
 void Framework::UIMLView::removeDrawable(Drawable& z)
 {
-    int index = memberList.getWertIndex(&z);
+    int index = memberList.getValueIndex(&z);
     if (index >= 0)
     {
         Text id = *idList.z(index);
@@ -1636,9 +1636,9 @@ const UIInit& UIMLView::getFactory()
 }
 
 //! calculates the needed size for all content elements to be visible
-Punkt UIMLView::calculateContentSize()
+Point UIMLView::calculateContentSize()
 {
-    Punkt maxP(0, 0);
+    Point maxP(0, 0);
     for (int i = dom->getChildCount() - 1; i >= 0; i--)
     { // TODO render elements backwards
         XML::Element* e = dom->zChild(i);
@@ -1646,7 +1646,7 @@ Punkt UIMLView::calculateContentSize()
             e->getAttributeValue("id"), e->getAttributeValue("id").getLength());
         if (z)
         {
-            maxP.x = MAX(maxP.x, z->getPosition().x + z->getBreite());
+            maxP.x = MAX(maxP.x, z->getPosition().x + z->getWidth());
             maxP.y = MAX(maxP.y, z->getPosition().y + z->getHeight());
         }
     }

UIMLView.h

@@ -450,7 +450,7 @@ namespace Framework
         {
         public:
             /// <summary>
-            /// if this style is set, then the mause event action will be
+            /// if this style is set, then the mousee event action will be
             /// overwritten for all member views. The onMemberMouseEvent
             /// function will be executed instead. The style needs to be set
             /// before the uiml is parsed
@@ -586,6 +586,6 @@ namespace Framework
         DLLEXPORT bool registerDrawable(const char* id, Drawable* z) override;
         DLLEXPORT const UIInit& getFactory() override;
         //! calculates the needed size for all content elements to be visible
-        DLLEXPORT Punkt calculateContentSize();
+        DLLEXPORT Point calculateContentSize();
     };
 } // namespace Framework

Vec2.h

@@ -177,7 +177,7 @@ namespace Framework
         //! Checks whether the vector is in the rectangle between two vectors
         //!  p1: A vector to one corner of the rectangle
         //!  p2: A vector to the opposite corner of the rectangle
-        inline bool istInRegion(const Vec2& p1, const Vec2& p2) const
+        inline bool isInRegion(const Vec2& p1, const Vec2& p2) const
         {
             const T medianX = (T)((p1.x + p2.x) / 2.0);
             const T medianY = (T)((p1.y + p2.y) / 2.0);

Window.cpp

@@ -71,141 +71,141 @@ LRESULT CALLBACK Framework::WindowProc(
         if (wparam == SIZE_RESTORED) nativeWindows.sendRestoreMessage(hwnd);
         break;
     case WM_CLOSE: // Close
-        if (nativeWindows.sendVSchliessMessage(hwnd)) return 0;
+        if (nativeWindows.sendPreCloseMessage(hwnd)) return 0;
         break;
     case WM_DESTROY:
-        if (nativeWindows.sendNSchliessMessage(hwnd)) return 0;
+        if (nativeWindows.sendPostCloseMessage(hwnd)) return 0;
         break;           // Mouse
     case WM_LBUTTONDOWN: // Left click
         {
-            MausStand[M_Links] = 1;
-            MouseEvent me = {ME_PLinks,
+            MouseState[M_Left] = 1;
+            MouseEvent me = {ME_PLeft,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_RBUTTONDOWN: // Right click
         {
-            MausStand[M_Rechts] = 1;
-            MouseEvent me = {ME_PRechts,
+            MouseState[M_Right] = 1;
+            MouseEvent me = {ME_PRight,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_MBUTTONDOWN: // Middle click
         {
-            MausStand[M_Mitte] = 1;
-            MouseEvent me = {ME_PMitte,
+            MouseState[M_Middle] = 1;
+            MouseEvent me = {ME_PMiddle,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_LBUTTONUP: // Left release
         {
-            MausStand[M_Links] = 0;
-            MouseEvent me = {ME_RLinks,
+            MouseState[M_Left] = 0;
+            MouseEvent me = {ME_RLeft,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_RBUTTONUP: // Right release
         {
-            MausStand[M_Rechts] = 0;
-            MouseEvent me = {ME_RRechts,
+            MouseState[M_Right] = 0;
+            MouseEvent me = {ME_RRight,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_MBUTTONUP: // Middle release
         {
-            MausStand[M_Mitte] = 0;
-            MouseEvent me = {ME_RMitte,
+            MouseState[M_Middle] = 0;
+            MouseEvent me = {ME_RMiddle,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_LBUTTONDBLCLK: // Left double click
         {
-            MouseEvent me = {ME_DKLinks,
+            MouseEvent me = {ME_DCLeft,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_RBUTTONDBLCLK: // Right double click
         {
-            MouseEvent me = {ME_DKRechts,
+            MouseEvent me = {ME_DCRight,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_MBUTTONDBLCLK: // Middle double click
         {
-            MouseEvent me = {ME_DKMitte,
+            MouseEvent me = {ME_DCMiddle,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_MOUSEHOVER: // Mouse enters window
         {
-            MausTrack = 1;
-            MouseEvent me = {ME_Betritt,
+            MouseTrack = 1;
+            MouseEvent me = {ME_Enter,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_MOUSELEAVE: // Mouse leaves window
         {
-            MausTrack = 1;
+            MouseTrack = 1;
             MouseEvent me = {ME_Leaves,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
@@ -213,12 +213,12 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_MOUSEMOVE: // Mouse is moving
         {
-            if (MausTrack)
+            if (MouseTrack)
             {
                 TRACKMOUSEEVENT lptme;
                 lptme.cbSize = sizeof(TRACKMOUSEEVENT);
@@ -226,31 +226,31 @@ LRESULT CALLBACK Framework::WindowProc(
                 lptme.dwHoverTime = 0;
                 lptme.hwndTrack = hwnd;
                 TrackMouseEvent(&lptme);
-                MausTrack = 0;
+                MouseTrack = 0;
             }
-            MouseEvent me = {ME_Bewegung,
+            MouseEvent me = {ME_Move,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam),
                 0,
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            nativeWindows.sendMausMessage(hwnd, me);
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
     case WM_MOUSEWHEEL: // Mouse scroll
         {
-            Punkt pos = getMausPos();
+            Point pos = getMousePos();
             RECT r;
             GetWindowRect(hwnd, &r);
             pos.x -= r.left;
             pos.y -= r.top;
             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;
+                me.id = !getKeyState(T_Shift) ? ME_DScroll : ME_RScroll;
             else
-                me.id = !getTastenStand(T_Shift) ? ME_UScroll : ME_LScroll;
-            nativeWindows.sendMausMessage(hwnd, me);
+                me.id = !getKeyState(T_Shift) ? ME_UScroll : ME_LScroll;
+            nativeWindows.sendMouseMessage(hwnd, me);
             break;
         }
         // Keyboard
@@ -261,7 +261,7 @@ LRESULT CALLBACK Framework::WindowProc(
                  0, 0
             };
             CalculateEnteredString((int)wparam, 0, te);
-            nativeWindows.sendTastaturMessage(hwnd, te);
+            nativeWindows.sendKeyboardMessage(hwnd, te);
             return 0;
         } // Key is pressed
     case WM_KEYUP:
@@ -271,14 +271,14 @@ LRESULT CALLBACK Framework::WindowProc(
                  0, 0
             };
             CalculateEnteredString((int)wparam, HIWORD(lparam) & 0xFF, te);
-            nativeWindows.sendTastaturMessage(hwnd, te);
+            nativeWindows.sendKeyboardMessage(hwnd, te);
             return 0;
         } // Key is released
     }
     return (DefWindowProc(hwnd, message, wparam, lparam));
 }
 
-void Framework::StartNachrichtenSchleife()
+void Framework::StartMessageLoop()
 {
     MSG msg;
     while (GetMessage(&msg, NULL, 0, 0) > 0 && !msgExit)
@@ -292,7 +292,7 @@ void Framework::StartNachrichtenSchleife()
     msgExit = 0;
 }
 
-void Framework::StopNachrichtenSchleife(HWND hwnd)
+void Framework::StopMessageLoop(HWND hwnd)
 {
     msgExit = 1;
     PostMessage(hwnd, WM_MOUSELEAVE, 0, 0);
@@ -301,7 +301,7 @@ void Framework::StopNachrichtenSchleife(HWND hwnd)
 void Framework::CalculateEnteredString(
     int virtualKeyCode, int scanCode, KeyboardEvent& te)
 {
-    memset(te.taste, 0, sizeof(te.taste));
+    memset(te.key, 0, sizeof(te.key));
     te.virtualKey = virtualKeyCode;
 #    ifdef WIN32
     unsigned char keyState[256];
@@ -311,11 +311,11 @@ void Framework::CalculateEnteredString(
         unsigned short str[2] = {0, 0};
         int count = ToAscii(virtualKeyCode, scanCode, keyState, str, 0);
         if (count == 1 && (str[0] & 0xFF) == str[0])
-            te.taste[0] = (unsigned char)str[0];
+            te.key[0] = (unsigned char)str[0];
         else if (count == 2 && (str[0] & 0xFF) == str[0]
                  && (str[1] & 0xFF) == str[1])
-            te.taste[0] = (unsigned char)str[0],
-            te.taste[1] = (unsigned char)str[1];
+            te.key[0] = (unsigned char)str[0],
+            te.key[1] = (unsigned char)str[1];
     }
 #    endif // WIN32
 }
@@ -329,15 +329,15 @@ NativeWindow::NativeWindow()
       makParam(0),
       sakParam(0),
       takParam(0),
-      mausAktion(0),
-      vCloseAktion(0),
-      nCloseAktion(0),
-      tastaturAktion(0),
+      mouseAction(0),
+      preCloseAction(0),
+      postCloseAction(0),
+      keyboardAction(0),
       screen(0),
       mx(-1),
       my(-1),
-      verschiebbar(0),
-      rahmen(0),
+      movable(0),
+      border(0),
       bitmap(0),
       hdc(0)
 {
@@ -357,12 +357,12 @@ NativeWindow::~NativeWindow()
     {
         nativeWindows.del();
     }
-    if (hWnd) zerstoeren();
+    if (hWnd) destroy();
     if (screen) screen->release();
 }
 
 // non-constant
-void NativeWindow::erstellen(
+void NativeWindow::create(
     int style, WNDCLASS wc) // Creates a window in Windows
 {
     if (!GetClassInfo(wc.hInstance, wc.lpszClassName, &wc))
@@ -393,7 +393,7 @@ void NativeWindow::erstellen(
     if (hWnd == 0)
     {
         MessageBox(hWnd,
-            "Fehler beim erstellen des Windows!",
+            "Fehler beim create des Windows!",
             "Error",
             MB_ICONERROR); // Error message on failure
         return;
@@ -401,7 +401,7 @@ void NativeWindow::erstellen(
     this->style = style;
 }
 
-void NativeWindow::erstellenEx(
+void NativeWindow::createEx(
     int exStyle, int style, WNDCLASSEX wc) // Create the window
 {
     if (!GetClassInfoEx(wc.hInstance, wc.lpszClassName, &wc))
@@ -433,7 +433,7 @@ void NativeWindow::erstellenEx(
     if (hWnd == 0)
     {
         MessageBox(hWnd,
-            "Fehler beim erstellen des Windows!",
+            "Fehler beim create des Windows!",
             "Error",
             MB_ICONERROR); // Error message on failure
         return;
@@ -441,19 +441,19 @@ void NativeWindow::erstellenEx(
     this->style = style;
 }
 
-void NativeWindow::setAnzeigeModus(int mod) // Display window
+void NativeWindow::setDisplayMode(int mod) // Display window
 {
-    if (rahmen)
+    if (border)
     {
         if (mod == 2)
-            ShowWindow(rahmen, 0);
+            ShowWindow(border, 0);
         else
-            ShowWindow(rahmen, mod);
+            ShowWindow(border, mod);
     }
     ShowWindow(hWnd, mod);
 }
 
-bool NativeWindow::setFokus() // Sets the focus on the window
+bool NativeWindow::setFocus() // Sets the focus on the window
 {
     DWORD dwCurrentThread = GetCurrentThreadId();
     DWORD dwFGThread = GetWindowThreadProcessId(GetForegroundWindow(), NULL);
@@ -477,7 +477,7 @@ bool NativeWindow::setFokus() // Sets the focus on the window
     return GetFocus() == hWnd;
 }
 
-void NativeWindow::setPosition(const Punkt& p) // Window position
+void NativeWindow::setPosition(const Point& p) // Window position
 {
     setPosition(p.x, p.y);
 }
@@ -499,7 +499,7 @@ void NativeWindow::setPosition(int x, int y)
         0); // Change position
 }
 
-void NativeWindow::setSize(Punkt& g) // Window size
+void NativeWindow::setSize(Point& g) // Window size
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find previous size
@@ -510,19 +510,19 @@ void NativeWindow::setSize(Punkt& g) // Window size
         hWnd, 0, res.left, res.top, res.right, res.bottom, 0); // Change size
 }
 
-void NativeWindow::setSize(int breite, int hoehe)
+void NativeWindow::setSize(int Width, int height)
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find previous size
     RECT res;
-    res.left = r.left, res.top = r.top, res.right = breite, res.bottom = hoehe;
+    res.left = r.left, res.top = r.top, res.right = Width, res.bottom = height;
     AdjustWindowRect(&res, style, 0);
     SetWindowPos(
         hWnd, 0, res.left, res.top, res.right, res.bottom, 0); // Change size
 }
 
 void NativeWindow::setBounds(
-    const Punkt& p, const Punkt& g) // sets size and position
+    const Point& p, const Point& g) // sets size and position
 {
     SetWindowPos(hWnd, 0, p.x, p.y, g.x, g.y, 0); // Change size and position
 }
@@ -533,36 +533,36 @@ void NativeWindow::setScreen(Screen* screen)
     this->screen = screen;
 }
 
-void NativeWindow::zerstoeren()
+void NativeWindow::destroy()
 {
     DestroyWindow(hWnd);
     hWnd = 0;
-    if (rahmen) DestroyWindow(rahmen);
-    rahmen = 0;
+    if (border) DestroyWindow(border);
+    border = 0;
     if (bitmap) DeleteObject(bitmap);
     bitmap = 0;
     if (hdc) DeleteDC(hdc);
     hdc = 0;
 }
 
-void NativeWindow::doMausAktion(MouseEvent& me)
+void NativeWindow::doMouseAction(MouseEvent& me)
 {
-    if (!mausAktion || !mausAktion(makParam, this, me)) return;
-    if (screen && me.id != ME_Betritt && me.id != ME_Leaves)
+    if (!mouseAction || !mouseAction(makParam, this, me)) return;
+    if (screen && me.id != ME_Enter && me.id != ME_Leaves)
     {
         screen->doMouseEvent(me);
-        if (!me.verarbeitet && verschiebbar)
+        if (!me.processed && movable)
         {
             if (mx != -1 && my != -1) // move
             {
                 RECT r;
-                if (rahmen)
+                if (border)
                 {
-                    GetWindowRect(rahmen, &r);
+                    GetWindowRect(border, &r);
                     r.right -= r.left, r.bottom -= r.top;
                     r.left += me.mx - mx;
                     r.top += me.my - my;
-                    SetWindowPos(rahmen,
+                    SetWindowPos(border,
                         0,
                         r.left,
                         r.top,
@@ -582,36 +582,36 @@ void NativeWindow::doMausAktion(MouseEvent& me)
                     r.bottom,
                     0); // Set position
             }
-            else if (me.id == ME_PLinks) // start moving
+            else if (me.id == ME_PLeft) // start moving
                 mx = me.mx, my = me.my;
-            if (me.id == ME_RLinks) // stop moving
+            if (me.id == ME_RLeft) // stop moving
                 mx = -1, my = -1;
-            me.verarbeitet = 1;
+            me.processed = 1;
         }
     }
 }
 
-void NativeWindow::doVSchliessAktion()
+void NativeWindow::doPreCloseAction()
 {
-    if (!vCloseAktion) return;
-    vCloseAktion(sakParam, this);
+    if (!preCloseAction) return;
+    preCloseAction(sakParam, this);
 }
 
-void NativeWindow::doNSchliessAktion()
+void NativeWindow::doPostCloseAction()
 {
-    if (!nCloseAktion) return;
-    nCloseAktion(sakParam, this);
+    if (!postCloseAction) return;
+    postCloseAction(sakParam, this);
 }
 
-void NativeWindow::doTastaturAktion(KeyboardEvent& te)
+void NativeWindow::doKeyboardAction(KeyboardEvent& te)
 {
-    if (!tastaturAktion || !tastaturAktion(takParam, this, te)) return;
+    if (!keyboardAction || !keyboardAction(takParam, this, te)) return;
     if (screen) screen->doKeyboardEvent(te);
 }
 
 void NativeWindow::doRestoreMessage() // makes the border visible
 {
-    if (rahmen) ShowWindow(rahmen, 1);
+    if (border) ShowWindow(border, 1);
     ShowWindow(hWnd, 1);
 }
 
@@ -621,7 +621,7 @@ void NativeWindow::setMouseEventParameter(
     makParam = p;
 }
 
-void NativeWindow::setSchliessEreignisParameter(
+void NativeWindow::setCloseEventParameter(
     void* p) // sets the close event parameter
 {
     sakParam = p;
@@ -633,26 +633,26 @@ void NativeWindow::setKeyboardEventParameter(
     takParam = p;
 }
 
-void NativeWindow::setMausAktion(MausAktion mausAk)
+void NativeWindow::setMouseAction(MouseAction mouseAk)
 {
-    mausAktion = mausAk;
+    mouseAction = mouseAk;
 }
 
-void NativeWindow::setVSchliessAktion(
+void NativeWindow::setPreCloseAction(
     std::function<void(void*, void*)> vSchliessAk)
 {
-    vCloseAktion = vSchliessAk;
+    preCloseAction = vSchliessAk;
 }
 
-void NativeWindow::setNSchliessAktion(
+void NativeWindow::setPostCloseAction(
     std::function<void(void*, void*)> nSchliessAk)
 {
-    nCloseAktion = nSchliessAk;
+    postCloseAction = nSchliessAk;
 }
 
-void NativeWindow::setTastaturAktion(TastaturAktion tastaturAk)
+void NativeWindow::setKeyboardAction(KeyboardAction tastaturAk)
 {
-    tastaturAktion = tastaturAk;
+    keyboardAction = tastaturAk;
 }
 
 void NativeWindow::setWindowHandle(HWND hWnd) // sets the operation window
@@ -660,11 +660,11 @@ void NativeWindow::setWindowHandle(HWND hWnd) // sets the operation window
     this->hWnd = hWnd;
 }
 
-void NativeWindow::setVerschiebbar(
-    bool verschiebbar) // determines whether the window can be
+void NativeWindow::setMovable(
+    bool movable) // determines whether the window can be
                        // moved by dragging with the mouse
 {
-    this->verschiebbar = verschiebbar;
+    this->movable = movable;
 }
 
 void NativeWindow::loadBorderWindow(Image* zImage,
@@ -692,7 +692,7 @@ void NativeWindow::loadBorderWindow(Image* zImage,
     BITMAPINFO info;
     info.bmiHeader.biSize = sizeof(info.bmiHeader);
     info.bmiHeader.biBitCount = 32;
-    info.bmiHeader.biWidth = zImage->getBreite();
+    info.bmiHeader.biWidth = zImage->getWidth();
     info.bmiHeader.biHeight = -zImage->getHeight();
     info.bmiHeader.biCompression = BI_RGB;
     info.bmiHeader.biPlanes = 1;
@@ -702,34 +702,34 @@ void NativeWindow::loadBorderWindow(Image* zImage,
     if (!bitmap) DeleteDC(hdc);
     GdiFlush();
     // Fill bitmap
-    int pitch = ((zImage->getBreite() * 32 + 31) & ~31) >> 3;
+    int pitch = ((zImage->getWidth() * 32 + 31) & ~31) >> 3;
     unsigned char* pRow = 0;
     int* buffer = zImage->getBuffer();
     for (int i = 0; i < zImage->getHeight(); ++i)
     {
         pRow = &pPixels[i * pitch];
-        for (int i2 = 0; i2 < zImage->getBreite(); ++i2)
+        for (int i2 = 0; i2 < zImage->getWidth(); ++i2)
         {
             pRow[i2 * 4]
-                = (unsigned char)((buffer[i2 + i * zImage->getBreite()] >> 16)
+                = (unsigned char)((buffer[i2 + i * zImage->getWidth()] >> 16)
                                   & 0xFF);
             pRow[i2 * 4 + 1]
-                = (unsigned char)((buffer[i2 + i * zImage->getBreite()] >> 8)
+                = (unsigned char)((buffer[i2 + i * zImage->getWidth()] >> 8)
                                   & 0xFF);
             pRow[i2 * 4 + 2]
-                = (unsigned char)((buffer[i2 + i * zImage->getBreite()])
+                = (unsigned char)((buffer[i2 + i * zImage->getWidth()])
                                   & 0xFF);
             pRow[i2 * 4 + 3]
-                = (unsigned char)((buffer[i2 + i * zImage->getBreite()] >> 24)
+                = (unsigned char)((buffer[i2 + i * zImage->getWidth()] >> 24)
                                   & 0xFF);
         }
     }
     // Calculate alpha
     unsigned char* pPixel = 0;
-    if (zImage->getBreite() * 4 == pitch)
+    if (zImage->getWidth() * 4 == pitch)
     {
         int i = 0;
-        int totalBytes = zImage->getBreite() * zImage->getHeight() * 4;
+        int totalBytes = zImage->getWidth() * zImage->getHeight() * 4;
 
         for (i = 0; i < totalBytes; i += 4)
         {
@@ -746,7 +746,7 @@ void NativeWindow::loadBorderWindow(Image* zImage,
 
         for (y = 0; y < zImage->getHeight(); ++y)
         {
-            for (x = 0; x < zImage->getBreite(); ++x)
+            for (x = 0; x < zImage->getWidth(); ++x)
             {
                 pPixel = &pPixels[(y * pitch) + (x * 4)];
                 pPixel[0] *= (unsigned char)((float)pPixel[3] / 255.0f);
@@ -758,34 +758,34 @@ void NativeWindow::loadBorderWindow(Image* zImage,
     // Continue creating window
     if (RegisterClassEx(&wcl))
     {
-        rahmen = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_LAYERED,
+        border = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_LAYERED,
             wcl.lpszClassName,
             TEXT("Transparentes Window"),
             WS_POPUP,
             0,
             0,
-            zImage->getBreite(),
+            zImage->getWidth(),
             zImage->getHeight(),
             0,
             0,
             wcl.hInstance,
             0);
-        if (rahmen)
+        if (border)
         {
             // draw
             HDC h = 0;
-            if ((h = GetDC(rahmen)) && bitmap)
+            if ((h = GetDC(border)) && bitmap)
             {
                 HGDIOBJ hPrevObj = NULL;
                 POINT ptDest = {0, 0};
                 POINT ptSrc = {0, 0};
-                SIZE client = {zImage->getBreite(), zImage->getHeight()};
+                SIZE client = {zImage->getWidth(), zImage->getHeight()};
                 BLENDFUNCTION blendFunc = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA};
 
                 hPrevObj = SelectObject(hdc, bitmap);
-                ClientToScreen(rahmen, &ptDest);
+                ClientToScreen(border, &ptDest);
 
-                UpdateLayeredWindow(rahmen,
+                UpdateLayeredWindow(border,
                     h,
                     &ptDest,
                     &client,
@@ -796,15 +796,15 @@ void NativeWindow::loadBorderWindow(Image* zImage,
                     ULW_ALPHA);
 
                 SelectObject(hdc, hPrevObj);
-                ReleaseDC(rahmen, h);
+                ReleaseDC(border, h);
             }
-            UpdateWindow(rahmen);
-            Punkt pos = getPosition() + (getGroesse() - zImage->getSize()) / 2;
-            SetWindowPos(rahmen,
+            UpdateWindow(border);
+            Point pos = getPosition() + (getSize() - zImage->getSize()) / 2;
+            SetWindowPos(border,
                 0,
                 pos.x,
                 pos.y,
-                zImage->getBreite(),
+                zImage->getWidth(),
                 zImage->getHeight(),
                 0);
         }
@@ -812,35 +812,35 @@ void NativeWindow::loadBorderWindow(Image* zImage,
 }
 
 // constant
-Punkt NativeWindow::getPosition() const // returns the position
+Point NativeWindow::getPosition() const // returns the position
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find position
     return {r.left, r.top};
 }
 
-Punkt NativeWindow::getGroesse() const // returns the size
+Point NativeWindow::getSize() const // returns the size
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find size
     return {r.right - r.left, r.bottom - r.top};
 }
 
-Punkt NativeWindow::getKoerperGroesse() const // returns the window body size
+Point NativeWindow::getBodySize() const // returns the window body size
 {
     RECT r;
     GetClientRect(hWnd, &r); // Find size
     return {r.right - r.left, r.bottom - r.top};
 }
 
-int NativeWindow::getKoerperBreite() const // returns the window body width
+int NativeWindow::getBodyWidth() const // returns the window body width
 {
     RECT r;
     GetClientRect(hWnd, &r); // Find size
     return r.right;
 }
 
-int NativeWindow::getKoerperHoehe() const // returns the window body height
+int NativeWindow::getBodyHeight() const // returns the window body height
 {
     RECT r;
     GetClientRect(hWnd, &r); // Find size
@@ -852,24 +852,24 @@ HWND NativeWindow::getWindowHandle() const // returns a handle to the window
     return hWnd;
 }
 
-bool NativeWindow::hatMausAktion() const
+bool NativeWindow::hasMouseAction() const
 {
-    return mausAktion != 0;
+    return mouseAction != 0;
 }
 
-bool NativeWindow::hatVSchliessAktion() const
+bool NativeWindow::hasPreCloseAction() const
 {
-    return vCloseAktion != 0;
+    return preCloseAction != 0;
 }
 
-bool NativeWindow::hatNSchliessAktion() const
+bool NativeWindow::hasPostCloseAction() const
 {
-    return nCloseAktion != 0;
+    return postCloseAction != 0;
 }
 
-bool NativeWindow::hatTastaturAktion() const
+bool NativeWindow::hasKeyboardAction() const
 {
-    return tastaturAktion != 0;
+    return keyboardAction != 0;
 }
 
 Screen* NativeWindow::getScreen() const
@@ -883,10 +883,10 @@ Screen* NativeWindow::zScreen() const
     return screen;
 }
 
-bool NativeWindow::istVerschiebbar()
+bool NativeWindow::isMovable()
     const // checks if the window can be moved by dragging with the mouse
 {
-    return verschiebbar;
+    return movable;
 }
 
 // Contents of the NativeWindowArray class from Window.h
@@ -954,63 +954,63 @@ void NativeWindowArray::del()
 }
 
 // Messages
-bool NativeWindowArray::sendVSchliessMessage(HWND hwnd)
+bool NativeWindowArray::sendPreCloseMessage(HWND hwnd)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getWindowHandle() == hwnd && This->hatVSchliessAktion())
+    if (This->getWindowHandle() == hwnd && This->hasPreCloseAction())
     {
-        This->doVSchliessAktion();
+        This->doPreCloseAction();
         ret = 1;
     }
     if (!next) return ret;
-    return ret || next->sendVSchliessMessage(hwnd);
+    return ret || next->sendPreCloseMessage(hwnd);
 }
 
-bool NativeWindowArray::sendNSchliessMessage(HWND hwnd)
+bool NativeWindowArray::sendPostCloseMessage(HWND hwnd)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getWindowHandle() == hwnd && This->hatNSchliessAktion())
+    if (This->getWindowHandle() == hwnd && This->hasPostCloseAction())
     {
-        This->doNSchliessAktion();
+        This->doPostCloseAction();
         ret = 1;
     }
     if (!next) return ret;
-    return ret || next->sendNSchliessMessage(hwnd);
+    return ret || next->sendPostCloseMessage(hwnd);
 }
 
-bool NativeWindowArray::sendMausMessage(HWND hwnd, MouseEvent& me)
+bool NativeWindowArray::sendMouseMessage(HWND hwnd, MouseEvent& me)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getWindowHandle() == hwnd && This->hatMausAktion())
+    if (This->getWindowHandle() == hwnd && This->hasMouseAction())
     {
-        This->doMausAktion(me);
+        This->doMouseAction(me);
         ret = 1;
     }
     if (!next) return ret;
-    return ret || next->sendMausMessage(hwnd, me);
+    return ret || next->sendMouseMessage(hwnd, me);
 }
 
-bool NativeWindowArray::sendTastaturMessage(HWND hwnd, KeyboardEvent& te)
+bool NativeWindowArray::sendKeyboardMessage(HWND hwnd, KeyboardEvent& te)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getWindowHandle() == hwnd && This->hatTastaturAktion())
+    if (This->getWindowHandle() == hwnd && This->hasKeyboardAction())
     {
-        This->doTastaturAktion(te);
+        This->doKeyboardAction(te);
         ret = 1;
     }
     if (!next) return ret;
-    return ret || next->sendTastaturMessage(hwnd, te);
+    return ret || next->sendKeyboardMessage(hwnd, te);
 }
 
 bool NativeWindowArray::sendRestoreMessage(HWND hwnd)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getWindowHandle() == hwnd && This->hatMausAktion())
+    if (This->getWindowHandle() == hwnd && This->hasMouseAction())
     {
         This->doRestoreMessage();
         ret = 1;
@@ -1025,11 +1025,11 @@ NativeWindow* NativeWindowArray::getThis()
 }
 
 // WMessageBox
-void Framework::WMessageBox(HWND hWnd, Text* titel, Text* meldung, UINT style)
+void Framework::WMessageBox(HWND hWnd, Text* title, Text* meldung, UINT style)
 {
     MessageBox(
-        hWnd, meldung->getText(), titel->getText(), style); // Message Box
-    titel->release();
+        hWnd, meldung->getText(), title->getText(), style); // Message Box
+    title->release();
     meldung->release();
 }
 #endif
@@ -1040,44 +1040,44 @@ Window::Window()
     : Drawable(),
       closingMe(0),
       closingMeParam(0),
-      rahmen(0),
-      titel(0),
+      border(0),
+      title(0),
       members(new RCArray<Drawable>()),
       bgBodyColor(0xFF000000),
       bgBodyPicture(0),
       bodyBuffer(0),
-      bgClosingFarbe(0xFF000000),
+      bgClosingColor(0xFF000000),
       bgClosingImage(0),
       closeBuffer(0),
-      closeKlickBuffer(0),
+      closeClickBuffer(0),
       vScroll(0),
       hScroll(0),
       kMin(0, 0),
       kMax(0, 0),
-      closeKlick(0),
-      klick(0),
+      closeClick(0),
+      click(0),
       moving(0),
       mx(0),
       my(0)
 {
-    style = Style::MEIgnoreVerarbeitet | Style::MEIgnoreSichtbar
+    style = Style::MEIgnoreProcessed | Style::MEIgnoreVisible
           | Style::MEIgnoreParentInside | Style::MEIgnoreInside;
     this->setMouseEvent(_ret1ME);
     this->setKeyboardEvent(_ret1TE);
-    min = Punkt(0, 0), max = Punkt(0, 0);
+    min = Point(0, 0), max = Point(0, 0);
 }
 
 // Destructor
 Window::~Window()
 {
-    if (rahmen) rahmen->release();
-    if (titel) titel->release();
+    if (border) border->release();
+    if (title) title->release();
     members->release();
     if (bodyBuffer) bodyBuffer->release();
     if (bgBodyPicture) bgBodyPicture->release();
     if (bgClosingImage) bgClosingImage->release();
     if (closeBuffer) closeBuffer->release();
-    if (closeKlickBuffer) closeKlickBuffer->release();
+    if (closeClickBuffer) closeClickBuffer->release();
     if (vScroll) vScroll->release();
     if (hScroll) hScroll->release();
 }
@@ -1086,50 +1086,50 @@ void Window::doMouseEvent(MouseEvent& me, bool userRet)
 {
     if (me.id == ME_Leaves)
     {
-        if (closeKlick != 0) rend = 1;
-        closeKlick = 0, klick = 0;
+        if (closeClick != 0) rend = 1;
+        closeClick = 0, click = 0;
     }
-    if (hatStyleNicht(Style::Sichtbar) || !me.insideParent || me.verarbeitet
+    if (hasStyleNot(Style::Visible) || !me.insideParent || me.processed
         || me.mx < 0 || me.my < 0 || me.mx >= gr.x || me.my >= gr.y || !userRet)
     {
         bool insideParent = me.insideParent;
-        bool verarbeitet = me.verarbeitet;
-        me.verarbeitet |= hatStyleNicht(Style::Sichtbar);
+        bool processed = me.processed;
+        me.processed |= hasStyleNot(Style::Visible);
         me.insideParent = 0;
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
+        if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
         int th = 0;
-        if (hatStyle(Style::Titel) && titel) th = titel->getHeight();
+        if (hasStyle(Style::Title) && title) th = title->getHeight();
         me.mx -= rbr;
         me.my -= rbr + th;
-        if (hatStyle(Style::VScroll) && vScroll) me.my += vScroll->getScroll();
-        if (hatStyle(Style::HScroll) && hScroll) me.mx += hScroll->getScroll();
-        if (me.id != ME_Betritt && me.id != ME_Leaves)
+        if (hasStyle(Style::VScroll) && vScroll) me.my += vScroll->getScroll();
+        if (hasStyle(Style::HScroll) && hScroll) me.mx += hScroll->getScroll();
+        if (me.id != ME_Enter && me.id != ME_Leaves)
         {
             for (int i = members->getEntryCount() - 1; i >= 0; i--)
                 members->z(i)->doPublicMouseEvent(me);
         }
         me.mx += rbr;
         me.my += rbr + th;
-        if (hatStyle(Style::VScroll) && vScroll) me.my -= vScroll->getScroll();
-        if (hatStyle(Style::HScroll) && hScroll) me.mx -= hScroll->getScroll();
+        if (hasStyle(Style::VScroll) && vScroll) me.my -= vScroll->getScroll();
+        if (hasStyle(Style::HScroll) && hScroll) me.mx -= hScroll->getScroll();
         me.insideParent = insideParent;
-        if (hatStyleNicht(Style::Sichtbar)) me.verarbeitet = verarbeitet;
+        if (hasStyleNot(Style::Visible)) me.processed = processed;
         if (!moving) return;
     }
-    bool mvtmp = me.verarbeitet;
-    if (hatStyleNicht(Style::Erlaubt)) me.verarbeitet = 1;
+    bool mvtmp = me.processed;
+    if (hasStyleNot(Style::Allowed)) me.processed = 1;
     int rbr = 0;
-    if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
+    if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
     int th = 0;
-    if (hatStyle(Style::Titel) && titel) th = titel->getHeight();
-    bool hSc = hatStyle(Style::HScroll) && hScroll;
-    bool vSc = hatStyle(Style::VScroll) && vScroll;
-    if (me.id == ME_Bewegung && moving && getMausStand(M_Links))
+    if (hasStyle(Style::Title) && title) th = title->getHeight();
+    bool hSc = hasStyle(Style::HScroll) && hScroll;
+    bool vSc = hasStyle(Style::VScroll) && vScroll;
+    if (me.id == ME_Move && moving && getMouseState(M_Left))
     {
-        if (hatStyle(Style::Beweglich) || hatStyle(Style::HeightChangeable)
-            || hatStyle(Style::BreiteChangeable)
-            || hatStyle(Style::TitelHeightChangeable))
+        if (hasStyle(Style::Movable) || hasStyle(Style::HeightChangeable)
+            || hasStyle(Style::WidthChangeable)
+            || hasStyle(Style::TitleHeightChangeable))
         {
             bool ret1 = 0;
             bool mset = 0;
@@ -1145,54 +1145,54 @@ void Window::doMouseEvent(MouseEvent& me, bool userRet)
             }
             bool minXb, maxXb, minYb, maxYb;
             bool kMinXb, kMaxXb, kMinYb, kMaxYb;
-            minXb = hatStyle(Style::MinBr);
-            maxXb = hatStyle(Style::MaxBr);
-            minYb = hatStyle(Style::MinHi);
-            maxYb = hatStyle(Style::MaxHi);
-            kMinXb = hatStyle(Style::BodyMinBr);
-            kMaxXb = hatStyle(Style::BodyMaxBr);
-            kMinYb = hatStyle(Style::BodyMinHi);
-            kMaxYb = hatStyle(Style::BodyMaxHi);
-            int fMinBr = rbr * 2 + scbr;
-            if (minXb) fMinBr = fMinBr < min.x ? min.x : fMinBr;
+            minXb = hasStyle(Style::MinWidth);
+            maxXb = hasStyle(Style::MaxWidth);
+            minYb = hasStyle(Style::MinHeight);
+            maxYb = hasStyle(Style::MaxHeight);
+            kMinXb = hasStyle(Style::BodyMinWidth);
+            kMaxXb = hasStyle(Style::BodyMaxWidth);
+            kMinYb = hasStyle(Style::BodyMinHeight);
+            kMaxYb = hasStyle(Style::BodyMaxHeight);
+            int fMinWidth = rbr * 2 + scbr;
+            if (minXb) fMinWidth = fMinWidth < min.x ? min.x : fMinWidth;
             if (kMinXb)
-                fMinBr = fMinBr < (rbr * 2 + kMin.x + scbr)
+                fMinWidth = fMinWidth < (rbr * 2 + kMin.x + scbr)
                            ? (rbr * 2 + kMin.x + scbr)
-                           : fMinBr;
-            int fMinHi = rbr * 2 + th + schi;
-            if (minYb) fMinHi = fMinHi < min.y ? min.y : fMinHi;
+                           : fMinWidth;
+            int fMinHeight = rbr * 2 + th + schi;
+            if (minYb) fMinHeight = fMinHeight < min.y ? min.y : fMinHeight;
             if (kMinYb)
-                fMinHi = fMinHi < (rbr * 2 + kMin.y + th + schi)
+                fMinHeight = fMinHeight < (rbr * 2 + kMin.y + th + schi)
                            ? (rbr * 2 + kMin.y + th + schi)
-                           : fMinHi;
-            int fMaxBr = 0;
-            if (maxXb) fMaxBr = max.x;
+                           : fMinHeight;
+            int fMaxWidth = 0;
+            if (maxXb) fMaxWidth = max.x;
             if (kMaxXb)
-                fMaxBr = fMaxBr < (rbr * 2 + kMax.x + scbr)
+                fMaxWidth = fMaxWidth < (rbr * 2 + kMax.x + scbr)
                            ? (rbr * 2 + kMax.x + scbr)
-                           : fMaxBr;
-            int fMaxHi = 0;
-            if (maxYb) fMaxHi = max.y;
+                           : fMaxWidth;
+            int fMaxHeight = 0;
+            if (maxYb) fMaxHeight = max.y;
             if (kMaxYb)
-                fMaxHi = fMaxHi < (rbr * 2 + kMax.y + th + schi)
+                fMaxHeight = fMaxHeight < (rbr * 2 + kMax.y + th + schi)
                            ? (rbr * 2 + kMax.y + th + schi)
-                           : fMaxHi;
+                           : fMaxHeight;
             minXb |= kMinXb, maxXb |= kMaxXb, minYb |= kMinYb, maxYb |= kMaxYb;
-            if (hatStyle(Style::HeightChangeable))
+            if (hasStyle(Style::HeightChangeable))
             {
                 if ((moving | 0x1) == moving) // top
                 {
                     pos.y -= my - me.my;
                     gr.y += my - me.my;
-                    if (gr.y < fMinHi)
+                    if (gr.y < fMinHeight)
                     {
-                        pos.y -= fMinHi - gr.y;
-                        gr.y = fMinHi;
+                        pos.y -= fMinHeight - gr.y;
+                        gr.y = fMinHeight;
                     }
-                    else if (maxYb && gr.y > fMaxHi)
+                    else if (maxYb && gr.y > fMaxHeight)
                     {
-                        pos.y -= gr.y - fMaxHi;
-                        gr.y = fMaxHi;
+                        pos.y -= gr.y - fMaxHeight;
+                        gr.y = fMaxHeight;
                     }
                     else if (vSc)
                         vScroll->getScrollData()->anzeige = gr.y;
@@ -1202,10 +1202,10 @@ void Window::doMouseEvent(MouseEvent& me, bool userRet)
                 else if ((moving | 0x2) == moving) // bottom
                 {
                     gr.y += me.my - my;
-                    if (gr.y < fMinHi)
-                        gr.y = fMinHi;
-                    else if (maxYb && gr.y > fMaxHi)
-                        gr.y = fMaxHi;
+                    if (gr.y < fMinHeight)
+                        gr.y = fMinHeight;
+                    else if (maxYb && gr.y > fMaxHeight)
+                        gr.y = fMaxHeight;
                     else
                     {
                         mset = 1;
@@ -1215,21 +1215,21 @@ void Window::doMouseEvent(MouseEvent& me, bool userRet)
                     ret1 = 1;
                 }
             }
-            if (hatStyle(Style::BreiteChangeable))
+            if (hasStyle(Style::WidthChangeable))
             {
                 if ((moving | 0x4) == moving) // left
                 {
                     pos.x -= mx - me.mx;
                     gr.x += mx - me.mx;
-                    if (gr.x < fMinBr)
+                    if (gr.x < fMinWidth)
                     {
-                        pos.x -= fMinBr - gr.x;
-                        gr.x = fMinBr;
+                        pos.x -= fMinWidth - gr.x;
+                        gr.x = fMinWidth;
                     }
-                    else if (maxXb && gr.x > fMaxBr)
+                    else if (maxXb && gr.x > fMaxWidth)
                     {
-                        pos.x -= gr.x - fMaxBr;
-                        gr.x = fMaxBr;
+                        pos.x -= gr.x - fMaxWidth;
+                        gr.x = fMaxWidth;
                     }
                     else if (hSc)
                         hScroll->getScrollData()->anzeige = gr.x;
@@ -1239,10 +1239,10 @@ void Window::doMouseEvent(MouseEvent& me, bool userRet)
                 else if ((moving | 0x8) == moving) // right
                 {
                     gr.x += me.mx - mx;
-                    if (gr.x < rbr * 2 + fMinBr)
-                        gr.x = rbr * 2 + fMinBr;
-                    else if (maxXb && gr.x > fMaxBr)
-                        gr.x = fMaxBr;
+                    if (gr.x < rbr * 2 + fMinWidth)
+                        gr.x = rbr * 2 + fMinWidth;
+                    else if (maxXb && gr.x > fMaxWidth)
+                        gr.x = fMaxWidth;
                     else
                     {
                         mset = 1;
@@ -1252,23 +1252,23 @@ void Window::doMouseEvent(MouseEvent& me, bool userRet)
                     ret1 = 1;
                 }
             }
-            if (hatStyle(Style::TitelHeightChangeable) && titel
-                && (moving | 0x10) == moving) // titel height
+            if (hasStyle(Style::TitleHeightChangeable) && title
+                && (moving | 0x10) == moving) // title height
             {
                 int maxTh = gr.y - rbr * 2 - schi;
                 if (kMaxYb)
                     maxTh = maxTh < (gr.x - rbr * 2 - kMin.y)
                               ? maxTh
                               : (gr.x - rbr * 2 - kMin.y);
-                if (hatStyle(Style::Closable))
+                if (hasStyle(Style::Closable))
                     maxTh = (gr.x - th - 5 - rbr * 2 - me.my + my) < 0 ? th
                                                                        : maxTh;
-                titel->setSize(
-                    titel->getBreite(), titel->getHeight() + me.my - my);
-                if (titel->getHeight() > maxTh)
-                    titel->setSize(titel->getBreite(), maxTh);
-                else if (titel->getHeight() < 5)
-                    titel->setSize(titel->getBreite(), 5);
+                title->setSize(
+                    title->getWidth(), title->getHeight() + me.my - my);
+                if (title->getHeight() > maxTh)
+                    title->setSize(title->getWidth(), maxTh);
+                else if (title->getHeight() < 5)
+                    title->setSize(title->getWidth(), 5);
                 else
                     mset = 1;
                 rend = 1;
@@ -1277,253 +1277,253 @@ void Window::doMouseEvent(MouseEvent& me, bool userRet)
             if (ret1)
             {
                 if (mset) mx = me.mx, my = me.my;
-                me.verarbeitet = 1;
+                me.processed = 1;
             }
-            if (hatStyle(Style::Beweglich) && (moving | 0x20) == moving) // move
+            if (hasStyle(Style::Movable) && (moving | 0x20) == moving) // move
             {
                 pos.x += me.mx - mx;
                 pos.y += me.my - my;
                 rend = 1;
                 ret1 = 1;
             }
-            if (ret1) me.verarbeitet = 1;
+            if (ret1) me.processed = 1;
         }
     }
-    if (me.id == ME_RLinks)
+    if (me.id == ME_RLeft)
     {
-        if (closeKlick) rend = 1;
-        closeKlick = 0, klick = 0;
+        if (closeClick) rend = 1;
+        closeClick = 0, click = 0;
         moving = 0;
         mx = -1, my = -1;
     }
     if (me.id == ME_Leaves)
     {
-        if (closeKlick != 0) rend = 1;
-        closeKlick = 0, klick = 0;
+        if (closeClick != 0) rend = 1;
+        closeClick = 0, click = 0;
     }
-    if (hatStyleNicht(Style::Sichtbar) || !me.insideParent || me.verarbeitet
+    if (hasStyleNot(Style::Visible) || !me.insideParent || me.processed
         || me.mx < 0 || me.my < 0 || me.mx >= gr.x || me.my >= gr.y || !userRet)
         return;
-    if (!me.verarbeitet)
+    if (!me.processed)
     {
-        if (hatStyle(Style::Closable) && me.my <= th + rbr
+        if (hasStyle(Style::Closable) && me.my <= th + rbr
             && me.mx >= gr.x + rbr - th && me.my >= rbr && me.mx <= gr.x - rbr)
         {
             if (!closingMe || closingMe(closingMeParam, this, me))
             {
-                if (me.id == ME_PLinks)
+                if (me.id == ME_PLeft)
                 {
-                    closeKlick = 1;
+                    closeClick = 1;
                     rend = 1;
                 }
-                if (!closeKlick && MausStand[M_Links])
+                if (!closeClick && MouseState[M_Left])
                 {
-                    closeKlick = 1;
+                    closeClick = 1;
                     rend = 1;
                 }
-                me.verarbeitet = 1;
+                me.processed = 1;
             }
         }
-        else if (closeKlick)
+        else if (closeClick)
         {
-            closeKlick = 0;
+            closeClick = 0;
             rend = 1;
         }
-        if (me.id == ME_PLinks && !closeKlick)
+        if (me.id == ME_PLeft && !closeClick)
         {
-            klick = 1;
+            click = 1;
             mx = me.mx, my = me.my;
             if (me.mx >= 0 && me.mx < gr.x && me.my >= 0 && me.my < rbr + 5
-                && !hatStyle(Style::TopPositionFixed))
+                && !hasStyle(Style::TopPositionFixed))
                 moving |= 0x1;
             if (me.mx >= 0 && me.mx < gr.x && me.my >= gr.y - (rbr + 5)
-                && me.my < gr.y && !hatStyle(Style::BottomPositionFixed))
+                && me.my < gr.y && !hasStyle(Style::BottomPositionFixed))
                 moving |= 0x2;
             if (me.mx >= 0 && me.mx < rbr + 5 && me.my >= 0 && me.my < gr.y
-                && !hatStyle(Style::LeftPositionFixed))
+                && !hasStyle(Style::LeftPositionFixed))
                 moving |= 0x4;
             if (me.mx >= gr.x - rbr - 5 && me.mx < gr.x && me.my >= 0
-                && me.my < gr.y && !hatStyle(Style::RightPositionFixed))
+                && me.my < gr.y && !hasStyle(Style::RightPositionFixed))
                 moving |= 0x8;
-            if (titel && me.mx >= 0 && me.mx < gr.x
-                && me.my >= titel->getHeight()
-                && me.my < titel->getHeight() + 2 * (rbr + 5))
+            if (title && me.mx >= 0 && me.mx < gr.x
+                && me.my >= title->getHeight()
+                && me.my < title->getHeight() + 2 * (rbr + 5))
                 moving |= 0x10;
-            if (titel && me.mx >= 0 && me.mx < gr.x && me.my >= rbr + 5
-                && me.my < titel->getHeight())
+            if (title && me.mx >= 0 && me.mx < gr.x && me.my >= rbr + 5
+                && me.my < title->getHeight())
                 moving |= 0x20;
         }
     }
     if (vSc)
     {
-        vScroll->doMausMessage(
+        vScroll->doMouseMessage(
             gr.x - rbr - 15, rbr + th, 15, gr.y - rbr * 2 - th, me);
         if (hSc)
-            hScroll->doMausMessage(
+            hScroll->doMouseMessage(
                 rbr, gr.y - rbr - 15, gr.x - rbr * 2 - 15, 15, me);
     }
     else if (hSc)
-        hScroll->doMausMessage(rbr, gr.y - rbr - 15, gr.x - rbr * 2, 15, me);
+        hScroll->doMouseMessage(rbr, gr.y - rbr - 15, gr.x - rbr * 2, 15, me);
     me.mx -= rbr;
     me.my -= rbr + th;
-    if (hatStyle(Style::VScroll) && vScroll) me.my += vScroll->getScroll();
-    if (hatStyle(Style::HScroll) && hScroll) me.mx += hScroll->getScroll();
-    if (me.id != ME_Betritt && me.id != ME_Leaves)
+    if (hasStyle(Style::VScroll) && vScroll) me.my += vScroll->getScroll();
+    if (hasStyle(Style::HScroll) && hScroll) me.mx += hScroll->getScroll();
+    if (me.id != ME_Enter && me.id != ME_Leaves)
     {
         for (int i = members->getEntryCount() - 1; i >= 0; i--)
             members->z(i)->doPublicMouseEvent(me);
     }
     me.mx += rbr;
     me.my += rbr + th;
-    if (hatStyle(Style::VScroll) && vScroll) me.my -= vScroll->getScroll();
-    if (hatStyle(Style::HScroll) && hScroll) me.mx -= hScroll->getScroll();
-    if (hatStyleNicht(Style::METransparenz)) me.verarbeitet = 1;
-    if (hatStyleNicht(Style::Erlaubt)) me.verarbeitet = mvtmp;
+    if (hasStyle(Style::VScroll) && vScroll) me.my -= vScroll->getScroll();
+    if (hasStyle(Style::HScroll) && hScroll) me.mx -= hScroll->getScroll();
+    if (hasStyleNot(Style::METransparent)) me.processed = 1;
+    if (hasStyleNot(Style::Allowed)) me.processed = mvtmp;
 }
 
 // non-const
 // -- Border --
 void Window::setBorderZ(Border* ram) // sets the border
 {
-    if (rahmen) rahmen->release();
-    rahmen = ram;
+    if (border) border->release();
+    border = ram;
     rend = 1;
 }
 
-void Window::setRFarbe(int f) // sets the border color
+void Window::setRColor(int f) // sets the border color
 {
-    if (!rahmen) rahmen = new LBorder();
-    rahmen->setFarbe(f);
+    if (!border) border = new LBorder();
+    border->setColor(f);
     rend = 1;
 }
 
-void Window::setRBreite(int br) // sets the border width
+void Window::setRWidth(int br) // sets the border width
 {
-    if (!rahmen) rahmen = new LBorder();
-    rahmen->setRamenBreite(br);
+    if (!border) border = new LBorder();
+    border->setBorderWidth(br);
     rend = 1;
 }
 
 // -- Title --
 void Window::setTitel(Text* txt) // sets the title
 {
-    if (!titel) titel = new TextField();
-    titel->setText(txt);
+    if (!title) title = new TextField();
+    title->setText(txt);
     rend = 1;
 }
 
 void Window::setTitelZ(Text* txt)
 {
-    if (!titel) titel = new TextField();
-    titel->setTextZ(txt);
+    if (!title) title = new TextField();
+    title->setTextZ(txt);
     rend = 1;
 }
 
 void Window::setTitel(const char* txt)
 {
-    if (!titel) titel = new TextField();
-    titel->setText(txt);
+    if (!title) title = new TextField();
+    title->setText(txt);
     rend = 1;
 }
 
-void Window::setTTextFeldZ(TextField* tf) // sets the title text field
+void Window::setTTextFieldZ(TextField* tf) // sets the title text field
 {
-    if (titel) titel->release();
-    titel = tf;
+    if (title) title->release();
+    title = tf;
     rend = 1;
 }
 
 // -- Font --
-void Window::setTFontZ(Font* schrift) // sets the title font
+void Window::setTFontZ(Font* font) // sets the title font
 {
-    if (!titel) titel = new TextField();
-    titel->setFontZ(schrift);
+    if (!title) title = new TextField();
+    title->setFontZ(font);
     rend = 1;
 }
 
-void Window::setTSFarbe(int f) // sets the title font color
+void Window::setTSColor(int f) // sets the title font color
 {
-    if (!titel) titel = new TextField();
-    titel->setSchriftFarbe(f);
+    if (!title) title = new TextField();
+    title->setFontColor(f);
     rend = 1;
 }
 
 void Window::setTSSize(int gr) // sets the title font size
 {
-    if (!titel) titel = new TextField();
-    titel->setSchriftSize((unsigned char)gr);
+    if (!title) title = new TextField();
+    title->setFontSize((unsigned char)gr);
     rend = 1;
 }
 
 // -- Title Background --
-void Window::setTBgFarbe(int f) // sets title background color
+void Window::setTBgColor(int f) // sets title background color
 {
-    if (!titel) titel = new TextField();
-    titel->setHintergrundFarbe(f);
+    if (!title) title = new TextField();
+    title->setBackgroundColor(f);
     rend = 1;
 }
 
 // -- Title AlphaField --
 void Window::setTAlphaFieldZ(AlphaField* af) // sets the title AlphaField
 {
-    if (!titel) titel = new TextField();
-    titel->setAlphaFieldZ(af);
+    if (!title) title = new TextField();
+    title->setAlphaFieldZ(af);
     rend = 1;
 }
 
-void Window::setTAfFarbe(int f) // sets the title AlphaField color
+void Window::setTAfColor(int f) // sets the title AlphaField color
 {
-    if (!titel) titel = new TextField();
-    titel->setAlphaFieldColor(f);
+    if (!title) title = new TextField();
+    title->setAlphaFieldColor(f);
     rend = 1;
 }
 
 void Window::setTAfStrength(int st) // sets the strength of the title AlphaField
 {
-    if (!titel) titel = new TextField();
-    titel->setAlphaFieldStrength(st);
+    if (!title) title = new TextField();
+    title->setAlphaFieldStrength(st);
     rend = 1;
 }
 
 // -- Title Background Image --
 void Window::setTBgImage(Image* b) // sets the title background image
 {
-    if (!titel) titel = new TextField();
-    titel->setHintergrundImage(b);
+    if (!title) title = new TextField();
+    title->setBackgroundImage(b);
     rend = 1;
 }
 
 void Window::setTBgImageZ(Image* b)
 {
-    if (!titel) titel = new TextField();
-    titel->setHintergrundImageZ(b);
+    if (!title) title = new TextField();
+    title->setBackgroundImageZ(b);
     rend = 1;
 }
 
 // -- Title Border --
 void Window::setTBorderZ(Border* ram) // sets the title border
 {
-    if (!titel) titel = new TextField();
-    titel->setBorderZ(ram);
+    if (!title) title = new TextField();
+    title->setBorderZ(ram);
     rend = 1;
 }
 
-void Window::setTRFarbe(int f) // sets the title border color
+void Window::setTRColor(int f) // sets the title border color
 {
-    if (!titel) titel = new TextField();
-    titel->setBorderColor(f);
+    if (!title) title = new TextField();
+    title->setBorderColor(f);
     rend = 1;
 }
 
-void Window::setTRBreite(int br) // sets the title border width
+void Window::setTRWidth(int br) // sets the title border width
 {
-    if (!titel) titel = new TextField();
-    titel->setBorderWidth(br);
+    if (!title) title = new TextField();
+    title->setBorderWidth(br);
     rend = 1;
 }
 
 // -- Body Background --
-void Window::setKBgFarbe(int f) // sets the body background color
+void Window::setKBgColor(int f) // sets the body background color
 {
     bgBodyColor = f;
     rend = 1;
@@ -1533,10 +1533,10 @@ void Window::setKBgFarbe(int f) // sets the body background color
 void Window::setKBgImage(Image* b) // sets the body background image
 {
     if (!bgBodyPicture) bgBodyPicture = new Image();
-    bgBodyPicture->neuImage(b->getBreite(), b->getHeight(), 0);
+    bgBodyPicture->newImage(b->getWidth(), b->getHeight(), 0);
     int* buff1 = bgBodyPicture->getBuffer();
     int* buff2 = b->getBuffer();
-    int gr = bgBodyPicture->getBreite() * bgBodyPicture->getHeight();
+    int gr = bgBodyPicture->getWidth() * bgBodyPicture->getHeight();
     for (int i = 0; i < gr; ++i)
         buff1[i] = buff2[i];
     b->release();
@@ -1558,10 +1558,10 @@ void Window::setKAlphaFieldZ(AlphaField* af) // sets the body AlphaField
     rend = 1;
 }
 
-void Window::setKAfFarbe(int f) // sets body AlphaField color
+void Window::setKAfColor(int f) // sets body AlphaField color
 {
     if (!bodyBuffer) bodyBuffer = new AlphaField();
-    bodyBuffer->setFarbe(f);
+    bodyBuffer->setColor(f);
     rend = 1;
 }
 
@@ -1578,15 +1578,15 @@ void Window::setClosingMeParam(void* param)
     closingMeParam = param;
 }
 
-void Window::setClosingMe(MausAktion closingMe) // sets the close mouse event
+void Window::setClosingMe(MouseAction closingMe) // sets the close mouse event
 {
     this->closingMe = closingMe;
 }
 
 // -- Close Background --
-void Window::setSBgFarbe(int f) // sets the close background color
+void Window::setSBgColor(int f) // sets the close background color
 {
-    bgClosingFarbe = f;
+    bgClosingColor = f;
     rend = 1;
 }
 
@@ -1594,10 +1594,10 @@ void Window::setSBgFarbe(int f) // sets the close background color
 void Window::setSBgImage(Image* b) // sets the close background image
 {
     if (!bgClosingImage) bgClosingImage = new Image();
-    bgClosingImage->neuImage(b->getBreite(), b->getHeight(), 0);
+    bgClosingImage->newImage(b->getWidth(), b->getHeight(), 0);
     int* buff1 = bgClosingImage->getBuffer();
     int* buff2 = b->getBuffer();
-    int gr = bgClosingImage->getBreite() * bgClosingImage->getHeight();
+    int gr = bgClosingImage->getWidth() * bgClosingImage->getHeight();
     for (int i = 0; i < gr; ++i)
         buff1[i] = buff2[i];
     b->release();
@@ -1619,10 +1619,10 @@ void Window::setSAlphaFieldZ(AlphaField* af) // sets the close AlphaField
     rend = 1;
 }
 
-void Window::setSAfFarbe(int f) // sets the color of the close AlphaField
+void Window::setSAfColor(int f) // sets the color of the close AlphaField
 {
     if (!closeBuffer) closeBuffer = new AlphaField();
-    closeBuffer->setFarbe(f);
+    closeBuffer->setColor(f);
     rend = 1;
 }
 
@@ -1636,23 +1636,23 @@ void Window::setSAfStrength(int st) // sets the strength of the close AlphaField
 // -- Close Click AlphaField --
 void Window::setSKAlphaFieldZ(AlphaField* af) // sets the close click AlphaField
 {
-    if (closeKlickBuffer) closeKlickBuffer->release();
-    closeKlickBuffer = af;
+    if (closeClickBuffer) closeClickBuffer->release();
+    closeClickBuffer = af;
     rend = 1;
 }
 
-void Window::setSKAfFarbe(int f) // sets the color of the close click AlphaField
+void Window::setSKAfColor(int f) // sets the color of the close click AlphaField
 {
-    if (!closeKlickBuffer) closeKlickBuffer = new AlphaField();
-    closeKlickBuffer->setFarbe(f);
+    if (!closeClickBuffer) closeClickBuffer = new AlphaField();
+    closeClickBuffer->setColor(f);
     rend = 1;
 }
 
 void Window::setSKAfStrength(
     int st) // sets the strength of the close click AlphaField
 {
-    if (!closeKlickBuffer) closeKlickBuffer = new AlphaField();
-    closeKlickBuffer->setStrength(st);
+    if (!closeClickBuffer) closeClickBuffer = new AlphaField();
+    closeClickBuffer->setStrength(st);
     rend = 1;
 }
 
@@ -1663,7 +1663,7 @@ void Window::setMin(int mx, int my) // sets the minimum window size
     min.y = my;
 }
 
-void Window::setMin(const Punkt& min)
+void Window::setMin(const Point& min)
 {
     this->min = min;
 }
@@ -1674,7 +1674,7 @@ void Window::setMax(int mx, int my) // sets the maximum window size
     max.y = my;
 }
 
-void Window::setMax(const Punkt& max)
+void Window::setMax(const Point& max)
 {
     this->max = max;
 }
@@ -1685,7 +1685,7 @@ void Window::setKMin(int mx, int my) // sets the minimum body size
     kMin.y = my;
 }
 
-void Window::setKMin(const Punkt& min)
+void Window::setKMin(const Point& min)
 {
     kMin = min;
 }
@@ -1696,7 +1696,7 @@ void Window::setKMax(int mx, int my) // sets the maximum body size
     kMax.y = my;
 }
 
-void Window::setKMax(const Punkt& max)
+void Window::setKMax(const Point& max)
 {
     kMax = max;
 }
@@ -1721,9 +1721,9 @@ void Window::setHSBMax(int max) // sets the scroll maximum
 {
     if (!hScroll) hScroll = new HScrollBar();
     int rbr = 0;
-    if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
+    if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
     int vsh = 0;
-    if (hatStyle(Style::VScroll) && vScroll) vsh = 15;
+    if (hasStyle(Style::VScroll) && vScroll) vsh = 15;
     hScroll->update(max, gr.x - rbr * 2 - vsh);
     rend = 1;
 }
@@ -1733,10 +1733,10 @@ void Window::setVSBMax(int max)
     if (!vScroll) vScroll = new VScrollBar();
     int rbr = 0;
     int th = 0;
-    if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
-    if (hatStyle(Style::Titel) && titel) th = titel->getHeight();
+    if (hasStyle(Style::Border) && border) rbr = border->getRWidth();
+    if (hasStyle(Style::Title) && title) th = title->getHeight();
     int hsh = 0;
-    if (hatStyle(Style::HScroll) && hScroll) hsh = 15;
+    if (hasStyle(Style::HScroll) && hScroll) hsh = 15;
     vScroll->update(max, gr.y - rbr * 2 - th - hsh);
     rend = 1;
 }
@@ -1759,7 +1759,7 @@ void Framework::Window::updateHScroll()
 {
     if (hScroll)
     {
-        hScroll->update(getNeededChildWidth(), getInnenBreite());
+        hScroll->update(getNeededChildWidth(), getInnerWidth());
     }
 }
 
@@ -1799,14 +1799,14 @@ void Window::removeMember(Drawable* zObj) // removes a member
 
 void Window::removeAll()
 {
-    members->leeren();
+    members->clear();
     rend = 1;
 }
 
 // -- Messages --
 bool Window::tick(double tickval) // tick
 {
-    if (hatStyle(Style::Sichtbar))
+    if (hasStyle(Style::Visible))
     {
         for (Drawable* i : *members)
             rend |= i->tick(tickval);
@@ -1816,17 +1816,17 @@ bool Window::tick(double tickval) // tick
         for (Drawable* i : *members)
             i->tick(tickval);
     }
-    if (vScroll && hatStyle(Style::VScroll)) rend |= vScroll->getRend();
-    if (hScroll && hatStyle(Style::HScroll)) rend |= hScroll->getRend();
+    if (vScroll && hasStyle(Style::VScroll)) rend |= vScroll->getNeedRender();
+    if (hScroll && hasStyle(Style::HScroll)) rend |= hScroll->getNeedRender();
     return Drawable::tick(tickval);
 }
 
 void Window::doKeyboardEvent(KeyboardEvent& te)
 {
-    bool ntakc = !te.verarbeitet;
-    if (hatStyle(Style::Sichtbar))
+    bool ntakc = !te.processed;
+    if (hasStyle(Style::Visible))
     {
-        if (te.verarbeitet)
+        if (te.processed)
         {
             for (int i = members->getEntryCount() - 1; i >= 0; i--)
                 members->z(i)->doKeyboardEvent(te);
@@ -1840,14 +1840,14 @@ void Window::doKeyboardEvent(KeyboardEvent& te)
             }
         }
     }
-    if (ntakc && te.verarbeitet && nTak)
-        te.verarbeitet = nTak(ntakParam, this, te);
+    if (ntakc && te.processed && nTak)
+        te.processed = nTak(ntakParam, this, te);
 }
 
 // -- Render --
 void Window::render(Image& zRObj) // draws to zRObj
 {
-    if (hatStyle(Style::Sichtbar))
+    if (hasStyle(Style::Visible))
     {
         lockDrawable();
         if (!zRObj.setDrawOptions(pos, gr))
@@ -1857,26 +1857,26 @@ void Window::render(Image& zRObj) // draws to zRObj
         }
         Drawable::render(zRObj);
         int rbr = 0;
-        if (hatStyle(Style::Border) && rahmen)
+        if (hasStyle(Style::Border) && border)
         {
-            rahmen->setSize(gr);
-            rahmen->render(zRObj);
-            rbr = rahmen->getRBreite();
+            border->setSize(gr);
+            border->render(zRObj);
+            rbr = border->getRWidth();
         }
         int th = 0;
-        if (titel)
-            titel->setStyle(TextField::Style::Sichtbar, hatStyle(Style::Titel));
-        if (hatStyle(Style::Titel) && titel)
+        if (title)
+            title->setStyle(TextField::Style::Visible, hasStyle(Style::Title));
+        if (hasStyle(Style::Title) && title)
         {
-            titel->setStyle(TextField::Style::Hintergrund,
-                hatStyle(Style::TitelHintergrund));
-            titel->setStyle(
-                TextField::Style::HAlpha, hatStyle(Style::TitelHAlpha));
-            titel->setStyle(
-                TextField::Style::HImage, hatStyle(Style::TitelHImage));
-            titel->setStyle(
-                TextField::Style::Buffered, hatStyle(Style::TitelBuffered));
-            th = titel->getHeight();
+            title->setStyle(TextField::Style::Background,
+                hasStyle(Style::TitleBackground));
+            title->setStyle(
+                TextField::Style::HAlpha, hasStyle(Style::TitleHAlpha));
+            title->setStyle(
+                TextField::Style::HImage, hasStyle(Style::TitleHImage));
+            title->setStyle(
+                TextField::Style::Buffered, hasStyle(Style::TitleBuffered));
+            th = title->getHeight();
             if (!zRObj.setDrawOptions(rbr, rbr, gr.x - rbr * 2, th))
             {
                 zRObj.releaseDrawOptions();
@@ -1884,20 +1884,20 @@ void Window::render(Image& zRObj) // draws to zRObj
                 return;
             }
             int sbr = 0;
-            if (hatStyle(Style::Closable))
+            if (hasStyle(Style::Closable))
             {
                 sbr = th;
-                if (hatStyle(Style::ClosingHintergrund))
+                if (hasStyle(Style::ClosingBackground))
                 {
-                    if (hatStyle(Style::ClosingHAlpha))
+                    if (hasStyle(Style::ClosingHAlpha))
                         zRObj.alphaRegion(
-                            gr.x - th - rbr * 2, 0, th, th, bgClosingFarbe);
+                            gr.x - th - rbr * 2, 0, th, th, bgClosingColor);
                     else
                         zRObj.fillRegion(
-                            gr.x - th - rbr * 2, 0, th, th, bgClosingFarbe);
-                    if (hatStyle(Style::ClosingHImage) && bgClosingImage)
+                            gr.x - th - rbr * 2, 0, th, th, bgClosingColor);
+                    if (hasStyle(Style::ClosingHImage) && bgClosingImage)
                     {
-                        if (hatStyle(Style::ClosingHAlpha))
+                        if (hasStyle(Style::ClosingHAlpha))
                             zRObj.alphaImage(gr.x - th - rbr * 2,
                                 0,
                                 th,
@@ -1911,36 +1911,36 @@ void Window::render(Image& zRObj) // draws to zRObj
                                 *bgClosingImage);
                     }
                 }
-                if (!hatStyle(Style::ClosingHImage) || !bgClosingImage)
+                if (!hasStyle(Style::ClosingHImage) || !bgClosingImage)
                 {
-                    zRObj.drawLinie(Punkt(gr.x - th - rbr * 2, 0),
-                        Punkt(gr.x - rbr * 2, th),
+                    zRObj.drawLine(Point(gr.x - th - rbr * 2, 0),
+                        Point(gr.x - rbr * 2, th),
                         0xFFFFFFFF);
-                    zRObj.drawLinie(Punkt(gr.x - rbr * 2, 0),
-                        Punkt(gr.x - th - rbr * 2, th),
+                    zRObj.drawLine(Point(gr.x - rbr * 2, 0),
+                        Point(gr.x - th - rbr * 2, th),
                         0xFFFFFFFF);
                 }
-                if (hatStyle(Style::ClosingBuffer) && closeBuffer)
+                if (hasStyle(Style::ClosingBuffer) && closeBuffer)
                 {
                     closeBuffer->setPosition(gr.x - th - rbr * 2, 0);
                     closeBuffer->setSize(th, th);
                     closeBuffer->render(zRObj);
                 }
-                if (hatStyle(Style::ClosingKlickBuffer) && closeKlickBuffer
-                    && closeKlick)
+                if (hasStyle(Style::ClosingClickBuffer) && closeClickBuffer
+                    && closeClick)
                 {
-                    closeKlickBuffer->setPosition(gr.x - th - rbr * 2, 0);
-                    closeKlickBuffer->setSize(th, th);
-                    closeKlickBuffer->render(zRObj);
+                    closeClickBuffer->setPosition(gr.x - th - rbr * 2, 0);
+                    closeClickBuffer->setSize(th, th);
+                    closeClickBuffer->render(zRObj);
                 }
             }
-            if (!hatStyle(Style::CustomTitle))
-                titel->setSize(gr.x - rbr * 2 - sbr, th);
-            titel->render(zRObj);
+            if (!hasStyle(Style::CustomTitle))
+                title->setSize(gr.x - rbr * 2 - sbr, th);
+            title->render(zRObj);
             zRObj.releaseDrawOptions();
         }
-        bool vSc = hatStyle(Style::VScroll) && vScroll;
-        bool hSc = hatStyle(Style::HScroll) && hScroll;
+        bool vSc = hasStyle(Style::VScroll) && vScroll;
+        bool hSc = hasStyle(Style::HScroll) && hScroll;
         if (vSc)
         {
             vScroll->render(
@@ -1963,21 +1963,21 @@ void Window::render(Image& zRObj) // draws to zRObj
             unlockDrawable();
             return;
         }
-        if (hatStyle(Style::BodyHintergrund))
+        if (hasStyle(Style::BodyBackground))
         {
-            if (hatStyle(Style::BodyHAlpha))
+            if (hasStyle(Style::BodyHAlpha))
                 zRObj.alphaRegion(0, 0, br, hi, bgBodyColor);
             else
                 zRObj.fillRegion(0, 0, br, hi, bgBodyColor);
-            if (hatStyle(Style::BodyHImage) && bgBodyPicture)
+            if (hasStyle(Style::BodyHImage) && bgBodyPicture)
             {
-                if (hatStyle(Style::BodyHAlpha))
+                if (hasStyle(Style::BodyHAlpha))
                     zRObj.alphaImage(0, 0, br, hi, *bgBodyPicture);
                 else
                     zRObj.drawImage(0, 0, br, hi, *bgBodyPicture);
             }
         }
-        if (hatStyle(Style::BodyBuffered) && bodyBuffer)
+        if (hasStyle(Style::BodyBuffered) && bodyBuffer)
         {
             bodyBuffer->setSize(br, hi);
             bodyBuffer->render(zRObj);
@@ -2002,165 +2002,165 @@ void Window::render(Image& zRObj) // draws to zRObj
 
 // constant
 // Returns the width of the interior area of the drawing in pixels
-int Window::getInnenBreite() const
+int Window::getInnerWidth() const
 {
-    return getBreite() - 2 * getRBreite();
+    return getWidth() - 2 * getRWidth();
 }
 
 // Returns the height of the interior area of the drawing in pixels
 int Window::getInnenHeight() const
 {
     int th = 0;
-    if (hatStyle(Style::Titel) && titel) th += titel->getHeight();
-    return getHeight() - 2 * getRBreite() - th;
+    if (hasStyle(Style::Title) && title) th += title->getHeight();
+    return getHeight() - 2 * getRWidth() - th;
 }
 
 // -- Border --
 Border* Window::getBorder() const // returns the border
 {
-    if (!rahmen) return 0;
-    return dynamic_cast<Border*>(rahmen->getThis());
+    if (!border) return 0;
+    return dynamic_cast<Border*>(border->getThis());
 }
 
 Border* Window::zBorder() const
 {
-    return rahmen;
+    return border;
 }
 
-int Window::getRFarbe() const // returns the border color
+int Window::getRColor() const // returns the border color
 {
-    if (!rahmen) return 0;
-    return rahmen->getFarbe();
+    if (!border) return 0;
+    return border->getColor();
 }
 
-int Window::getRBreite() const // returns the border width
+int Window::getRWidth() const // returns the border width
 {
-    if (!rahmen || hatStyleNicht(Style::Border)) return 0;
-    return rahmen->getRBreite();
+    if (!border || hasStyleNot(Style::Border)) return 0;
+    return border->getRWidth();
 }
 
 // -- Title --
 Text* Window::getTitel() const // returns the title
 {
-    if (!titel) return 0;
-    return titel->getText();
+    if (!title) return 0;
+    return title->getText();
 }
 
 Text* Window::zTitel() const
 {
-    if (!titel) return 0;
-    return titel->zText();
+    if (!title) return 0;
+    return title->zText();
 }
 
 TextField* Window::getTTextField() const // returns the title text field
 {
-    if (!titel) return 0;
-    return dynamic_cast<TextField*>(titel->getThis());
+    if (!title) return 0;
+    return dynamic_cast<TextField*>(title->getThis());
 }
 
 TextField* Window::zTTextField() const
 {
-    return titel;
+    return title;
 }
 
 // -- Title Font --
 Font* Window::getTFont() const // returns the title font
 {
-    if (!titel) return 0;
-    return titel->getFont();
+    if (!title) return 0;
+    return title->getFont();
 }
 
 Font* Window::zTFont() const
 {
-    if (!titel) return 0;
-    return titel->zFont();
+    if (!title) return 0;
+    return title->zFont();
 }
 
-int Window::getTSFarbe() const // returns the title font color
+int Window::getTSColor() const // returns the title font color
 {
-    if (!titel) return 0;
-    return titel->getSchriftFarbe();
+    if (!title) return 0;
+    return title->getFontColor();
 }
 
 int Window::getTSSize() const // returns the title font size
 {
-    if (!titel) return 0;
-    return titel->getSchriftSize();
+    if (!title) return 0;
+    return title->getFontSize();
 }
 
 // -- Title Background --
-int Window::getTBgFarbe() const // returns the title background color
+int Window::getTBgColor() const // returns the title background color
 {
-    if (!titel) return 0;
-    return titel->getHintergrundFarbe();
+    if (!title) return 0;
+    return title->getBackgroundColor();
 }
 
 // -- Title AlphaField --
 AlphaField* Window::getTAlphaField() const // returns the title AlphaField
 {
-    if (!titel) return 0;
-    return titel->getAlphaField();
+    if (!title) return 0;
+    return title->getAlphaField();
 }
 
 AlphaField* Window::zTAlphaField() const
 {
-    if (!titel) return 0;
-    return titel->zAlphaField();
+    if (!title) return 0;
+    return title->zAlphaField();
 }
 
-int Window::getTAfFarbe() const // returns the color of the title AlphaField
+int Window::getTAfColor() const // returns the color of the title AlphaField
 {
-    if (!titel) return 0;
-    return titel->getAlphaFieldColor();
+    if (!title) return 0;
+    return title->getAlphaFieldColor();
 }
 
 int Window::getTAfStrength()
     const // returns the strength of the title AlphaField
 {
-    if (!titel) return 0;
-    return titel->getAlphaFieldStrength();
+    if (!title) return 0;
+    return title->getAlphaFieldStrength();
 }
 
 // -- Title Background Image --
 Image* Window::getTBgImage() const // returns the title background image
 {
-    if (!titel) return 0;
-    return titel->getHintergrundImage();
+    if (!title) return 0;
+    return title->getBackgroundImage();
 }
 
 Image* Window::zTBgImage() const
 {
-    if (!titel) return 0;
-    return titel->zHintergrundImage();
+    if (!title) return 0;
+    return title->zBackgroundImage();
 }
 
 // -- Title Border --
 Border* Window::getTBorder() const // returns the title border
 {
-    if (!titel) return 0;
-    return titel->getBorder();
+    if (!title) return 0;
+    return title->getBorder();
 }
 
 Border* Window::zTBorder() const
 {
-    if (!titel) return 0;
-    return titel->zBorder();
+    if (!title) return 0;
+    return title->zBorder();
 }
 
-int Window::getTRFarbe() const // returns the title border color
+int Window::getTRColor() const // returns the title border color
 {
-    if (!titel) return 0;
-    return titel->getBorderColor();
+    if (!title) return 0;
+    return title->getBorderColor();
 }
 
-int Window::getTRBreite() const // returns the title border width
+int Window::getTRWidth() const // returns the title border width
 {
-    if (!titel) return 0;
-    return titel->getBorderWidth();
+    if (!title) return 0;
+    return title->getBorderWidth();
 }
 
 // -- Body Background --
-int Window::getKBgFarbe() const // returns the body background color
+int Window::getKBgColor() const // returns the body background color
 {
     return bgBodyColor;
 }
@@ -2189,10 +2189,10 @@ AlphaField* Window::zKAlphaField() const
     return bodyBuffer;
 }
 
-int Window::getKAfFarbe() const // returns the body AlphaField color
+int Window::getKAfColor() const // returns the body AlphaField color
 {
     if (!bodyBuffer) return 0;
-    return bodyBuffer->getFarbe();
+    return bodyBuffer->getColor();
 }
 
 int Window::getKAfStrength() const // returns the strength of the body AlphaField
@@ -2202,9 +2202,9 @@ int Window::getKAfStrength() const // returns the strength of the body AlphaFiel
 }
 
 // -- Close Background --
-int Window::getSBgFarbe() const // returns the close background color
+int Window::getSBgColor() const // returns the close background color
 {
-    return bgClosingFarbe;
+    return bgClosingColor;
 }
 
 // -- Close Background Image --
@@ -2231,10 +2231,10 @@ AlphaField* Window::zSAlphaField() const
     return closeBuffer;
 }
 
-int Window::getSAfFarbe() const // returns the close AlphaField color
+int Window::getSAfColor() const // returns the close AlphaField color
 {
     if (!closeBuffer) return 0;
-    return closeBuffer->getFarbe();
+    return closeBuffer->getColor();
 }
 
 int Window::getSAfStrength()
@@ -2247,45 +2247,45 @@ int Window::getSAfStrength()
 // -- Close Click AlphaField --
 AlphaField* Window::getSKAlphaField() const // returns the close click AlphaField
 {
-    if (!closeKlickBuffer) return 0;
-    return dynamic_cast<AlphaField*>(closeKlickBuffer->getThis());
+    if (!closeClickBuffer) return 0;
+    return dynamic_cast<AlphaField*>(closeClickBuffer->getThis());
 }
 
 AlphaField* Window::zSKAlphaField() const
 {
-    return closeKlickBuffer;
+    return closeClickBuffer;
 }
 
-int Window::getSKAfFarbe() const // returns the close click AlphaField color
+int Window::getSKAfColor() const // returns the close click AlphaField color
 {
-    if (!closeKlickBuffer) return 0;
-    return closeKlickBuffer->getFarbe();
+    if (!closeClickBuffer) return 0;
+    return closeClickBuffer->getColor();
 }
 
 int Window::getSKAfStrength()
     const // returns the strength of the close click AlphaField
 {
-    if (!closeKlickBuffer) return 0;
-    return closeKlickBuffer->getStrength();
+    if (!closeClickBuffer) return 0;
+    return closeClickBuffer->getStrength();
 }
 
 // -- min max --
-const Punkt& Window::getMin() const // returns the minimum window size
+const Point& Window::getMin() const // returns the minimum window size
 {
     return min;
 }
 
-const Punkt& Window::getMax() const // returns the maximum window size
+const Point& Window::getMax() const // returns the maximum window size
 {
     return max;
 }
 
-const Punkt& Window::getKMin() const // returns the minimum body size
+const Point& Window::getKMin() const // returns the minimum body size
 {
     return kMin;
 }
 
-const Punkt& Window::getKMax() const // returns the maximum body size
+const Point& Window::getKMax() const // returns the maximum body size
 {
     return kMax;
 }
@@ -2324,7 +2324,7 @@ int Framework::Window::getNeededChildWidth() const
     int max = 0;
     for (Drawable* z : *members)
     {
-        if (z->getX() + z->getBreite() > max) max = z->getX() + z->getBreite();
+        if (z->getX() + z->getWidth() > max) max = z->getX() + z->getWidth();
     }
     return max;
 }
@@ -2340,7 +2340,7 @@ int Framework::Window::getNeededChildHeight() const
 }
 
 // -- Copy --
-Drawable* Window::dublizieren() const // Creates a copy of the window
+Drawable* Window::duplicate() const // Creates a copy of the window
 {
     Window* ret = new Window();
     ret->setPosition(pos);
@@ -2349,36 +2349,36 @@ Drawable* Window::dublizieren() const // Creates a copy of the window
     ret->setKeyboardEventParameter(takParam);
     ret->setMouseEvent(mak);
     ret->setKeyboardEvent(tak);
-    if (toolTip) ret->setToolTipZ((ToolTip*)toolTip->dublizieren());
+    if (toolTip) ret->setToolTipZ((ToolTip*)toolTip->duplicate());
     ret->setStyle(style);
     ret->setClosingMeParam(closingMeParam);
     ret->setClosingMe(closingMe);
-    if (rahmen)
+    if (border)
     {
-        ret->setRBreite(rahmen->getRBreite());
-        ret->setRFarbe(rahmen->getFarbe());
+        ret->setRWidth(border->getRWidth());
+        ret->setRColor(border->getColor());
     }
-    if (titel) ret->setTTextFeldZ((TextField*)titel->dublizieren());
-    ret->setKBgFarbe(bgBodyColor);
+    if (title) ret->setTTextFieldZ((TextField*)title->duplicate());
+    ret->setKBgColor(bgBodyColor);
     if (bgBodyPicture)
         ret->setKBgImage(dynamic_cast<Image*>(bgBodyPicture->getThis()));
     if (bodyBuffer)
     {
-        ret->setKAfFarbe(bodyBuffer->getFarbe());
+        ret->setKAfColor(bodyBuffer->getColor());
         ret->setKAfStrength(bodyBuffer->getStrength());
     }
-    ret->setSBgFarbe(bgClosingFarbe);
+    ret->setSBgColor(bgClosingColor);
     if (bgClosingImage)
         ret->setSBgImage(dynamic_cast<Image*>(bgClosingImage->getThis()));
     if (closeBuffer)
     {
-        ret->setSAfFarbe(closeBuffer->getFarbe());
+        ret->setSAfColor(closeBuffer->getColor());
         ret->setSAfStrength(closeBuffer->getStrength());
     }
-    if (closeKlickBuffer)
+    if (closeClickBuffer)
     {
-        ret->setSKAfFarbe(closeKlickBuffer->getFarbe());
-        ret->setSKAfStrength(closeKlickBuffer->getStrength());
+        ret->setSKAfColor(closeClickBuffer->getColor());
+        ret->setSKAfStrength(closeClickBuffer->getStrength());
     }
     if (vScroll)
     {

Window.h

@@ -32,13 +32,13 @@ namespace Framework
     DLLEXPORT LRESULT CALLBACK WindowProc(
         HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
     //! Starts a loop that processes user input. The loop runs until
-    //! StopNachrichtenSchleife is called somewhere in the program
-    DLLEXPORT void StartNachrichtenSchleife();
+    //! StopMessageLoop is called somewhere in the program
+    DLLEXPORT void StartMessageLoop();
     //! Stops the execution of the framework's message loop.
     //! \param hwnd A handle to any framework window that can receive
-    //! messages. Required to send a message so that StartNachrichtenSchleife
+    //! messages. Required to send a message so that StartMessageLoop
     //! stops waiting and exits immediately
-    DLLEXPORT void StopNachrichtenSchleife(HWND hwnd);
+    DLLEXPORT void StopMessageLoop(HWND hwnd);
     //! Translates a keycode sent by Windows into the character of the
     //! pressed key
     DLLEXPORT void CalculateEnteredString(
@@ -53,14 +53,14 @@ namespace Framework
         void* makParam;
         void* sakParam;
         void* takParam;
-        MausAktion mausAktion;
-        std::function<void(void*, void*)> vCloseAktion;
-        std::function<void(void*, void*)> nCloseAktion;
-        TastaturAktion tastaturAktion;
+        MouseAction mouseAction;
+        std::function<void(void*, void*)> preCloseAction;
+        std::function<void(void*, void*)> postCloseAction;
+        KeyboardAction keyboardAction;
         Screen* screen;
         int mx, my;
-        bool verschiebbar;
-        HWND rahmen;
+        bool movable;
+        HWND border;
         HBITMAP bitmap;
         HDC hdc;
 
@@ -78,7 +78,7 @@ namespace Framework
         //! (for a normal window) \param wc The Windows API window class from
         //! which a window should be created. Can be created with the F_Normal
         //! function. lpszClassName must have been set.
-        DLLEXPORT void erstellen(int style, WNDCLASS wc);
+        DLLEXPORT void create(int style, WNDCLASS wc);
         //! Creates the window
         //! \param exStyle The EX style of the window. Example:
         //! WS_EX_OVERLAPPEDWINDOW (for a normal window)
@@ -86,49 +86,49 @@ namespace Framework
         //! (for a normal window) \param wc The Windows API window class from
         //! which a window should be created. Can be created with the F_Normal
         //! function. lpszClassName must have been set.
-        DLLEXPORT void erstellenEx(int exStyle, int style, WNDCLASSEX wc);
+        DLLEXPORT void createEx(int exStyle, int style, WNDCLASSEX wc);
         //! Sets the display mode of the window
         //! \param mod The mode. Example: SW_SHOWNORMAL to show the window
         //! and SW_HIDE to minimize it
-        DLLEXPORT void setAnzeigeModus(int mod);
+        DLLEXPORT void setDisplayMode(int mod);
         //! Sets the focus to the window so that keyboard input is received
-        DLLEXPORT bool setFokus();
+        DLLEXPORT bool setFocus();
         //! Sets the position of the window on the screen
         //! \param pos The position in pixels
-        DLLEXPORT void setPosition(const Punkt& pos);
+        DLLEXPORT void setPosition(const Point& pos);
         //! Sets the position of the window on the screen
         //! \param x The X position in pixels
         //! \param y The Y position in pixels
         DLLEXPORT void setPosition(int x, int y);
         //! Sets the size of the window on the screen
         //! \param gr\u00f6\u00dfe The size in pixels
-        DLLEXPORT void setSize(Punkt& groesse);
+        DLLEXPORT void setSize(Point& groesse);
         //! Sets the size of the window on the screen
-        //! \param breite The width in pixels
+        //! \param Width The width in pixels
         //! \param h\u00f6he The height in pixels
-        DLLEXPORT void setSize(int breite, int hoehe);
+        DLLEXPORT void setSize(int Width, int height);
         //! Sets the position and size of the window
         //! \param pos The position in pixels
         //! \param gr\u00f6\u00dfe The size in pixels
-        DLLEXPORT void setBounds(const Punkt& pos, const Punkt& groesse);
+        DLLEXPORT void setBounds(const Point& pos, const Point& groesse);
         //! Sets the screen object used to forward keyboard and mouse input
         //! to the framework's objects. Must be called with 0 before the
         //! window is destroyed. \param screen The screen object
         DLLEXPORT void setScreen(Screen* screen);
         //! Destroys the window
-        DLLEXPORT void zerstoeren();
-        //! Processes mouse messages. Calls MausAktion and forwards events
-        //! to the screen with objects if MausAktion returns 1
+        DLLEXPORT void destroy();
+        //! Processes mouse messages. Calls MouseAction and forwards events
+        //! to the screen with objects if MouseAction returns 1
         //! \param me The event triggered by the mouse input
-        DLLEXPORT void doMausAktion(MouseEvent& me);
+        DLLEXPORT void doMouseAction(MouseEvent& me);
         //! Calls the pre-close callback function
-        DLLEXPORT void doVSchliessAktion();
+        DLLEXPORT void doPreCloseAction();
         //! Calls the post-close callback function
-        DLLEXPORT void doNSchliessAktion();
-        //! Processes keyboard messages. Calls TastaturAktion and forwards
-        //! events to the screen with objects if TastaturAktion returns 1
+        DLLEXPORT void doPostCloseAction();
+        //! Processes keyboard messages. Calls KeyboardAction and forwards
+        //! events to the screen with objects if KeyboardAction returns 1
         //! \param me The event triggered by the keyboard input
-        DLLEXPORT void doTastaturAktion(KeyboardEvent& et);
+        DLLEXPORT void doKeyboardAction(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
@@ -136,7 +136,7 @@ namespace Framework
         DLLEXPORT void setMouseEventParameter(void* p);
         //! Sets the parameter passed to the callback function on close
         //! \param p The parameter
-        DLLEXPORT void setSchliessEreignisParameter(void* p);
+        DLLEXPORT void setCloseEventParameter(void* p);
         //! Sets the parameter passed to the callback function on a keyboard
         //! event
         //! \param p The parameter
@@ -146,26 +146,26 @@ namespace Framework
         //! further processed by the window. The standard function __ret1ME
         //! can be used, defined in MouseEvent.h and always returns 1
         //! \param ak A pointer to the callback function
-        DLLEXPORT void setMausAktion(MausAktion ak);
+        DLLEXPORT void setMouseAction(MouseAction ak);
         //! Sets the callback function to be called before closing.
         //! \param ak A pointer to the callback function
-        DLLEXPORT void setVSchliessAktion(std::function<void(void*, void*)> ak);
+        DLLEXPORT void setPreCloseAction(std::function<void(void*, void*)> ak);
         //! Sets the callback function to be called after closing.
         //! \param ak A pointer to the callback function
-        DLLEXPORT void setNSchliessAktion(std::function<void(void*, void*)> ak);
+        DLLEXPORT void setPostCloseAction(std::function<void(void*, void*)> 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. The standard function __ret1TE can be used,
         //! defined in KeyboardEvent.h and always returns 1. Other standard
-        //! functions are _nurNummernTE and _nurHexTE also from
+        //! functions are _onlyNumbersTE and _onlyHexTE also from
         //! KeyboardEvent.h \param ak A pointer to the callback function
-        DLLEXPORT void setTastaturAktion(TastaturAktion ak);
+        DLLEXPORT void setKeyboardAction(KeyboardAction ak);
         //! Sets the handle to the window that should be managed by this class
         //! \param hwnd The handle
         DLLEXPORT void setWindowHandle(HWND hWnd);
         //! Specifies whether the window can be moved by dragging with the mouse
-        //! \param verschiebbar 1 if the window may be moved
-        DLLEXPORT void setVerschiebbar(bool verschiebbar);
+        //! \param movable 1 if the window may be moved
+        DLLEXPORT void setMovable(bool movable);
         //! Sets a transparent frame around the window
         //! \param zImage An image containing the frame
         //! \param hins The HINSTANCE of the program (passed by the Framework to
@@ -176,33 +176,33 @@ namespace Framework
         //! Returns the handle of the managed window
         DLLEXPORT HWND getWindowHandle() const;
         //! Returns the position of the window in pixels
-        DLLEXPORT Punkt getPosition() const;
+        DLLEXPORT Point getPosition() const;
         //! Returns the size of the window in pixels
-        DLLEXPORT Punkt getGroesse() const;
+        DLLEXPORT Point getSize() const;
         //! Returns the size of the window body in pixels
-        DLLEXPORT Punkt getKoerperGroesse() const;
+        DLLEXPORT Point getBodySize() const;
         //! Returns the width of the window body in pixels
-        DLLEXPORT int getKoerperBreite() const;
+        DLLEXPORT int getBodyWidth() const;
         //! Returns the height of the window body in pixels
-        DLLEXPORT int getKoerperHoehe() const;
+        DLLEXPORT int getBodyHeight() const;
         //! Returns whether a callback function for a mouse event was set
-        DLLEXPORT bool hatMausAktion() const;
+        DLLEXPORT bool hasMouseAction() const;
         //! Returns whether a callback function for the event before
         //! closing the window was set
-        DLLEXPORT bool hatVSchliessAktion() const;
+        DLLEXPORT bool hasPreCloseAction() const;
         //! Returns whether a callback function for the event after
         //! closing the window was set
-        DLLEXPORT bool hatNSchliessAktion() const;
+        DLLEXPORT bool hasPostCloseAction() const;
         //! Returns whether a callback function for a keyboard event
         //! was set
-        DLLEXPORT bool hatTastaturAktion() const;
+        DLLEXPORT bool hasKeyboardAction() const;
         //! Returns the screen to whose drawings the events are forwarded
         DLLEXPORT Screen* getScreen() const;
         //! Returns the screen without increased reference counter to whose
         //! drawings the events are forwarded
         DLLEXPORT Screen* zScreen() const;
         //! Returns whether the window is movable
-        DLLEXPORT bool istVerschiebbar() const;
+        DLLEXPORT bool isMovable() const;
     };
 
     //! Manages all Windows API windows in the framework
@@ -231,18 +231,18 @@ namespace Framework
         DLLEXPORT void del();
         //! Sends the pre-close event to a specific window
         //! \param hWnd The handle to the window
-        DLLEXPORT bool sendVSchliessMessage(HWND hWnd);
+        DLLEXPORT bool sendPreCloseMessage(HWND hWnd);
         //! Sends the post-close event to a specific window
         //! \param hWnd The handle to the window
-        DLLEXPORT bool sendNSchliessMessage(HWND hwnd);
+        DLLEXPORT bool sendPostCloseMessage(HWND hwnd);
         //! 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, MouseEvent& me);
+        DLLEXPORT bool sendMouseMessage(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, KeyboardEvent& te);
+        DLLEXPORT bool sendKeyboardMessage(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);
@@ -252,12 +252,12 @@ namespace Framework
 
     //! Creates a Windows API popup window with a message
     //! \param hWnd A handle to the window that should be blocked until
-    //! the popup window is closed. Can be 0 \param titel The title
+    //! the popup window is closed. Can be 0 \param title The title
     //! of the popup window \param meldung The message to display in the
     //! window \param style Determines the icon displayed in the window.
     //! Example: MB_ICONERROR, MB_ICONINFORMATION
     DLLEXPORT void WMessageBox(
-        HWND hWnd, Text* titel, Text* meldung, UINT style);
+        HWND hWnd, Text* title, Text* meldung, UINT style);
 #endif
     //! Window class in the program
     class Window : public Drawable
@@ -267,7 +267,7 @@ namespace Framework
         {
         public:
             //! Determines whether the window body has a background
-            static const __int64 BodyHintergrund = 0x000000008;
+            static const __int64 BodyBackground = 0x000000008;
             //! Determines whether alpha blending is used when drawing
             //! the body background
             static const __int64 BodyHAlpha = 0x000000010;
@@ -276,20 +276,20 @@ namespace Framework
             //! Determines whether the body has a color gradient
             static const __int64 BodyBuffered = 0x000000040;
             //! Determines whether the window has a title bar
-            static const __int64 Titel = 0x000000080;
+            static const __int64 Title = 0x000000080;
             //! Determines whether the title bar has a background
-            static const __int64 TitelHintergrund = 0x000000100;
+            static const __int64 TitleBackground = 0x000000100;
             //! Determines whether alpha blending is used when drawing
             //! the title background
-            static const __int64 TitelHAlpha = 0x000000200;
+            static const __int64 TitleHAlpha = 0x000000200;
             //! Determines whether an image is used for the title background
-            static const __int64 TitelHImage = 0x000000400;
+            static const __int64 TitleHImage = 0x000000400;
             //! Determines whether the title bar has a color gradient
-            static const __int64 TitelBuffered = 0x000000800;
+            static const __int64 TitleBuffered = 0x000000800;
             //! Determines whether a close button is displayed in the title bar
             static const __int64 Closable = 0x000001000;
             //! Determines whether the close button has a background
-            static const __int64 ClosingHintergrund = 0x000002000;
+            static const __int64 ClosingBackground = 0x000002000;
             //! Determines whether alpha blending is used when drawing
             //! the close button background
             static const __int64 ClosingHAlpha = 0x000004000;
@@ -299,42 +299,42 @@ namespace Framework
             static const __int64 ClosingBuffer = 0x000010000;
             //! Determines whether the close button has a color gradient
             //! while being pressed
-            static const __int64 ClosingKlickBuffer = 0x000020000;
+            static const __int64 ClosingClickBuffer = 0x000020000;
             //! Determines whether the user can move the window by holding
             //! the left mouse button in the title bar
-            static const __int64 Beweglich = 0x000040000;
+            static const __int64 Movable = 0x000040000;
             //! Determines whether the user can change the width of the window
             //! by holding the left mouse button on the right or left window edge
-            static const __int64 BreiteChangeable = 0x000080000;
+            static const __int64 WidthChangeable = 0x000080000;
             //! Determines whether the user can change the height of the window
             //! by holding the left mouse button on the top or bottom window edge
             static const __int64 HeightChangeable = 0x000100000;
             //! Determines whether the user can change the title bar height
             //! by holding the left mouse button on the bottom edge of the title bar
-            static const __int64 TitelHeightChangeable = 0x000200000;
+            static const __int64 TitleHeightChangeable = 0x000200000;
             //! Determines whether there is a minimum window width
-            static const __int64 MinBr = 0x000400000;
+            static const __int64 MinWidth = 0x000400000;
             //! Determines whether there is a maximum window width
-            static const __int64 MaxBr = 0x000800000;
+            static const __int64 MaxWidth = 0x000800000;
             //! Determines whether there is a minimum window height
-            static const __int64 MinHi = 0x001000000;
+            static const __int64 MinHeight = 0x001000000;
             //! Determines whether there is a maximum window height
-            static const __int64 MaxHi = 0x002000000;
+            static const __int64 MaxHeight = 0x002000000;
             //! Determines whether there is a minimum body width
-            static const __int64 BodyMinBr = 0x004000000;
+            static const __int64 BodyMinWidth = 0x004000000;
             //! Determines whether there is a maximum body width
-            static const __int64 BodyMaxBr = 0x008000000;
+            static const __int64 BodyMaxWidth = 0x008000000;
             //! Determines whether there is a minimum body height
-            static const __int64 BodyMinHi = 0x010000000;
+            static const __int64 BodyMinHeight = 0x010000000;
             //! Determines whether there is a maximum body height
-            static const __int64 BodyMaxHi = 0x020000000;
+            static const __int64 BodyMaxHeight = 0x020000000;
             //! Determines whether a scrollbar appears at the right window edge
             static const __int64 VScroll = 0x040000000;
             //! Determines whether a scrollbar appears at the bottom window edge
             static const __int64 HScroll = 0x080000000;
             //! Determines whether mouse events should also be processed by
             //! drawings behind the window
-            static const __int64 METransparenz = 0x100000000;
+            static const __int64 METransparent = 0x100000000;
             //! Determines whether the window has a border
             static const __int64 Border = 0x200000000;
             //! Determines whether the left side of the window is fixed when
@@ -353,47 +353,47 @@ namespace Framework
             //! should remain unchanged
             static const __int64 CustomTitle = 0x4000000000;
             //! Combines flags MinHeight, MaxHeight, MaxWidth, MaxHeight
-            static const __int64 min_max = MinHi | MaxHi | MaxBr | MaxHi;
+            static const __int64 min_max = MinHeight | MaxHeight | MaxWidth | MaxHeight;
             //! Combines flags BodyMinWidth, BodyMaxWidth, BodyMinHeight,
             //! BodyMaxWidth
             static const __int64 body_min_max
-                = BodyMinBr | BodyMaxBr | BodyMinHi | BodyMaxBr;
+                = BodyMinWidth | BodyMaxWidth | BodyMinHeight | BodyMaxWidth;
             //! Combines flags VScroll, HScroll
             static const __int64 scroll = VScroll | HScroll;
             //! Combines flags TitleHeightChangeable, HeightChangeable,
             //! WidthChangeable, Movable
-            static const __int64 nichtfixiert = TitelHeightChangeable
+            static const __int64 nichtfixiert = TitleHeightChangeable
                                               | HeightChangeable
-                                              | BreiteChangeable | Beweglich;
+                                              | WidthChangeable | Movable;
 
             //! Combines flags Visible, Enabled, Border, Title,
             //! TitleBuffered, Closable, ClosingImage, ClosingClickBuffer,
             //! Movable
             static const __int64 normal
-                = Sichtbar | Erlaubt | Border | Titel | TitelBuffered | Closable
-                | ClosingHImage | ClosingKlickBuffer | Beweglich
-                | MEIgnoreVerarbeitet | MEIgnoreSichtbar | MEIgnoreParentInside
+                = Visible | Allowed | Border | Title | TitleBuffered | Closable
+                | ClosingHImage | ClosingClickBuffer | Movable
+                | MEIgnoreProcessed | MEIgnoreVisible | MEIgnoreParentInside
                 | MEIgnoreInside;
         };
 
     private:
-        MausAktion closingMe;
+        MouseAction closingMe;
         void* closingMeParam;
-        Border* rahmen;
-        TextField* titel;
+        Border* border;
+        TextField* title;
         RCArray<Drawable>* members;
         int bgBodyColor;
         Image* bgBodyPicture;
         AlphaField* bodyBuffer;
-        int bgClosingFarbe;
+        int bgClosingColor;
         Image* bgClosingImage;
         AlphaField* closeBuffer;
-        AlphaField* closeKlickBuffer;
+        AlphaField* closeClickBuffer;
         VScrollBar* vScroll;
         HScrollBar* hScroll;
-        Punkt min, max;
-        Punkt kMin, kMax;
-        bool closeKlick, klick;
+        Point min, max;
+        Point kMin, kMax;
+        bool closeClick, click;
         int moving;
         int mx, my;
 
@@ -412,10 +412,10 @@ namespace Framework
         DLLEXPORT void setBorderZ(Border* ram);
         //! Sets the color of the window border
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setRFarbe(int f);
+        DLLEXPORT void setRColor(int f);
         //! Sets the width of the window border
         //! \param br The width in pixels
-        DLLEXPORT void setRBreite(int br);
+        DLLEXPORT void setRWidth(int br);
         //! Sets the title of the window
         //! \param txt The text
         DLLEXPORT void setTitel(Text* txt);
@@ -427,25 +427,25 @@ namespace Framework
         DLLEXPORT void setTitel(const char* txt);
         //! Sets a pointer to the TextField that draws the title text
         //! \param tf The TextField
-        DLLEXPORT void setTTextFeldZ(TextField* tf);
+        DLLEXPORT void setTTextFieldZ(TextField* tf);
         //! Sets the font used for the title
-        //! \param schrift The font
-        DLLEXPORT void setTFontZ(Font* schrift);
+        //! \param font The font
+        DLLEXPORT void setTFontZ(Font* font);
         //! Sets the color of the font used for the title
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setTSFarbe(int f);
+        DLLEXPORT void setTSColor(int f);
         //! Sets the size of the font used for the title
         //! \param gr The height of a line in pixels
         DLLEXPORT void setTSSize(int gr);
         //! Sets the background color of the title
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setTBgFarbe(int f);
+        DLLEXPORT void setTBgColor(int f);
         //! Sets a pointer to the color gradient of the title
         //! \param af The color gradient
         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);
+        DLLEXPORT void setTAfColor(int f);
         //! Sets the strength of the color gradient of the title
         //! \param st The strength
         DLLEXPORT void setTAfStrength(int st);
@@ -460,13 +460,13 @@ namespace Framework
         DLLEXPORT void setTBorderZ(Border* ram);
         //! Sets the color of the border of the title
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setTRFarbe(int f);
+        DLLEXPORT void setTRColor(int f);
         //! Sets the width of the border of the title
         //! \param br The width in pixels
-        DLLEXPORT void setTRBreite(int br);
+        DLLEXPORT void setTRWidth(int br);
         //! Sets the background color of the body
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setKBgFarbe(int f);
+        DLLEXPORT void setKBgColor(int f);
         //! Sets the background image of the body by copying
         //! \param b The image to copy
         DLLEXPORT void setKBgImage(Image* b);
@@ -478,7 +478,7 @@ namespace Framework
         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);
+        DLLEXPORT void setKAfColor(int f);
         //! Sets the strength of the color gradient of the body
         //! \param st The strength
         DLLEXPORT void setKAfStrength(int st);
@@ -489,12 +489,12 @@ namespace Framework
         //! a mouse event. If the callback returns 0 or was not set, the mouse
         //! event is not further processed by the drawing. The window is not
         //! closed automatically but should be closed in the callback by calling
-        //! removeStyle( Window::Style::Sichtbar );
+        //! removeStyle( Window::Style::Visible );
         //! \param ak A pointer to the callback function
-        DLLEXPORT void setClosingMe(MausAktion closingMe);
+        DLLEXPORT void setClosingMe(MouseAction closingMe);
         //! Sets the background color of the close button
         //! \param f The color in A8R8G8B8 format
-        DLLEXPORT void setSBgFarbe(int f);
+        DLLEXPORT void setSBgColor(int f);
         //! Sets the background image of the close button by copying
         //! \param b The image to copy
         DLLEXPORT void setSBgImage(Image* b);
@@ -506,7 +506,7 @@ namespace Framework
         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);
+        DLLEXPORT void setSAfColor(int f);
         //! Sets the strength of the color gradient of the close button
         //! \param st The strength
         DLLEXPORT void setSAfStrength(int st);
@@ -515,7 +515,7 @@ namespace Framework
         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);
+        DLLEXPORT void setSKAfColor(int f);
         //! Sets the strength of the color gradient used when clicking the
         //! close button \param st The strength
         DLLEXPORT void setSKAfStrength(int st);
@@ -525,28 +525,28 @@ namespace Framework
         DLLEXPORT void setMin(int mx, int my);
         //! Sets the minimum size of the window
         //! \param min The minimum width and height in pixels
-        DLLEXPORT void setMin(const Punkt& min);
+        DLLEXPORT void setMin(const Point& min);
         //! Sets the maximum size of the window
         //! \param mx The maximum width in pixels
         //! \param my The maximum height in pixels
         DLLEXPORT void setMax(int mx, int my);
         //! Sets the maximum size of the window
         //! \param min The maximum width and height in pixels
-        DLLEXPORT void setMax(const Punkt& max);
+        DLLEXPORT void setMax(const Point& max);
         //! Sets the minimum size of the window body
         //! \param mx The minimum width in pixels
         //! \param my The minimum height in pixels
         DLLEXPORT void setKMin(int mx, int my);
         //! Sets the minimum size of the window body
         //! \param min The minimum width and height in pixels
-        DLLEXPORT void setKMin(const Punkt& min);
+        DLLEXPORT void setKMin(const Point& min);
         //! Sets the maximum size of the window body
         //! \param mx The maximum width in pixels
         //! \param my The maximum height in pixels
         DLLEXPORT void setKMax(int mx, int my);
         //! Sets the maximum size of the window body
         //! \param min The maximum width and height in pixels
-        DLLEXPORT void setKMax(const Punkt& max);
+        DLLEXPORT void setKMax(const Point& max);
         //! Sets a pointer to the scrollbar at the bottom of the window
         //! \param hScroll The scrollbar
         DLLEXPORT void setHScrollBarZ(HScrollBar* hScroll);
@@ -594,7 +594,7 @@ namespace Framework
         //! \param zRObj The image to draw into
         DLLEXPORT void render(Image& zRObj) override;
         //! Returns the inner width of the drawing in pixels
-        DLLEXPORT int getInnenBreite() const override;
+        DLLEXPORT int getInnerWidth() const override;
         //! Returns the inner height of the drawing in pixels
         DLLEXPORT int getInnenHeight() const override;
         //! Returns the border of the window
@@ -602,9 +602,9 @@ namespace Framework
         //! Returns the border of the window without increased reference counter
         DLLEXPORT Border* zBorder() const;
         //! Returns the color of the window border in A8R8G8B8 format
-        DLLEXPORT int getRFarbe() const;
+        DLLEXPORT int getRColor() const;
         //! Returns the width of the window border in pixels
-        DLLEXPORT int getRBreite() const;
+        DLLEXPORT int getRWidth() const;
         //! Returns the title of the window
         DLLEXPORT Text* getTitel() const;
         //! Returns the title of the window without increased reference counter
@@ -619,17 +619,17 @@ namespace Framework
         //! Returns the font without increased reference counter used for the title
         DLLEXPORT Font* zTFont() const;
         //! Returns the font color of the title in A8R8G8B8 format
-        DLLEXPORT int getTSFarbe() const;
+        DLLEXPORT int getTSColor() const;
         //! Returns the height of a line of the title in pixels
         DLLEXPORT int getTSSize() const;
         //! Returns the background color of the title in A8R8G8B8 format
-        DLLEXPORT int getTBgFarbe() const;
+        DLLEXPORT int getTBgColor() const;
         //! Returns the color gradient of the title
         DLLEXPORT AlphaField* getTAlphaField() const;
         //! Returns the color gradient of the title without increased reference counter
         DLLEXPORT AlphaField* zTAlphaField() const;
         //! Returns the color of the color gradient of the title in A8R8G8B8 format
-        DLLEXPORT int getTAfFarbe() const;
+        DLLEXPORT int getTAfColor() const;
         //! Returns the strength of the color gradient of the title
         DLLEXPORT int getTAfStrength() const;
         //! Returns the background image of the title
@@ -641,11 +641,11 @@ namespace Framework
         //! Returns the border of the title without increased reference counter
         DLLEXPORT Border* zTBorder() const;
         //! Returns the color of the title border in A8R8G8B8 format
-        DLLEXPORT int getTRFarbe() const;
+        DLLEXPORT int getTRColor() const;
         //! Returns the width of the title border
-        DLLEXPORT int getTRBreite() const;
+        DLLEXPORT int getTRWidth() const;
         //! Returns the background color of the body
-        DLLEXPORT int getKBgFarbe() const;
+        DLLEXPORT int getKBgColor() const;
         //! Returns the background image of the body
         DLLEXPORT Image* getKBgImage() const;
         //! Returns the background image of the body without increased reference counter
@@ -655,11 +655,11 @@ namespace Framework
         //! Returns the color gradient of the body without increased reference counter
         DLLEXPORT AlphaField* zKAlphaField() const;
         //! Returns the color of the color gradient of the body in A8R8G8B8 format
-        DLLEXPORT int getKAfFarbe() const;
+        DLLEXPORT int getKAfColor() const;
         //! Returns the strength of the color gradient of the body
         DLLEXPORT int getKAfStrength() const;
         //! Returns the background color of the close button in A8R8G8B8 format
-        DLLEXPORT int getSBgFarbe() const;
+        DLLEXPORT int getSBgColor() const;
         //! Returns the background image of the close button
         DLLEXPORT Image* getSBgImage() const;
         //! Returns the background image of the close button without increased
@@ -672,7 +672,7 @@ namespace Framework
         DLLEXPORT AlphaField* zSAlphaField() const;
         //! Returns the color of the color gradient of the close button in
         //! A8R8G8B8 format
-        DLLEXPORT int getSAfFarbe() const;
+        DLLEXPORT int getSAfColor() 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
@@ -682,18 +682,18 @@ namespace Framework
         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;
+        DLLEXPORT int getSKAfColor() const;
         //! Returns the strength of the color gradient used when the close
         //! button is pressed
         DLLEXPORT int getSKAfStrength() const;
         //! Returns the minimum window size in pixels
-        DLLEXPORT const Punkt& getMin() const;
+        DLLEXPORT const Point& getMin() const;
         //! Returns the maximum window size in pixels
-        DLLEXPORT const Punkt& getMax() const;
+        DLLEXPORT const Point& getMax() const;
         //! Returns the minimum body size in pixels
-        DLLEXPORT const Punkt& getKMin() const;
+        DLLEXPORT const Point& getKMin() const;
         //! Returns the maximum body size in pixels
-        DLLEXPORT const Punkt& getKMax() const;
+        DLLEXPORT const Point& getKMax() const;
         //! Returns the scrollbar from the right window edge
         DLLEXPORT VScrollBar* getVScrollBar() const;
         //! Returns the scrollbar from the right window edge without increased
@@ -712,7 +712,7 @@ namespace Framework
         DLLEXPORT int getNeededChildHeight() const;
         //! Creates a copy of the window that can be modified without
         //! affecting the original
-        DLLEXPORT Drawable* dublizieren() const override;
+        DLLEXPORT Drawable* duplicate() const override;
     };
 } // namespace Framework
 #endif

World2D.cpp

@@ -91,7 +91,7 @@ void Object2D::setCollision(bool handle)
 bool Object2D::handleCollision(Object2D* obj)
 {
     Vertex hp;
-    if (istModelInnen(obj, &hp)) // hp is set to the collision point
+    if (isModelInside(obj, &hp)) // hp is set to the collision point
     {
         // Velocity of this object with rotation
         Vertex v1
@@ -179,17 +179,17 @@ bool Object2D::tick(const WorldInfo& info, double zeit)
     return rSpeed != 0 || speed != Vertex(0, 0);
 }
 
-bool Object2D::istPunktInnen(Vertex p, bool ignoreTransparent) const
+bool Object2D::isPointInside(Vertex p, bool ignoreTransparent) const
 {
     return 0;
 }
 
-bool Object2D::istLinieInnen(Vertex a, Vertex b, bool ignoreTransparent) const
+bool Object2D::isLineInside(Vertex a, Vertex b, bool ignoreTransparent) const
 {
     return 0;
 }
 
-bool Object2D::istModelInnen(
+bool Object2D::isModelInside(
     const Object2D* zObj, Vertex* sp, bool end, bool ignoreTransparent) const
 {
     return 0;
@@ -309,7 +309,7 @@ Object2D* World2D::zObjectAt(int x, int y, bool ignoreTransparentFlag)
 {
     for (auto o : *objects)
     {
-        if (o->istPunktInnen(Punkt(x, y), ignoreTransparentFlag)) return o;
+        if (o->isPointInside(Point(x, y), ignoreTransparentFlag)) return o;
     }
     return 0;
 }
@@ -340,7 +340,7 @@ void World2D::removeObject(Object2D* zObj)
 
 void World2D::removeAll()
 {
-    objects->leeren();
+    objects->clear();
 }
 
 void World2D::explosion(Vertex worldPos, float intensity, float maxRad)
@@ -417,7 +417,7 @@ bool World2D::tick(double zeit)
 }
 
 void World2D::render(Mat3<float>& kamMat,
-    Punkt size,
+    Point size,
     Image& zRObj,
     int xOffset,
     int yOffset,
@@ -448,7 +448,7 @@ void World2D::render(Mat3<float>& kamMat,
 }
 
 void World2D::render(
-    Mat3<float>& kamMat, Punkt size, Image& zRObj, const char* kamName)
+    Mat3<float>& kamMat, Point size, Image& zRObj, const char* kamName)
 {
     if (!info.hasSize || !info.circular)
     {

World2D.h

@@ -18,7 +18,7 @@ namespace Framework
         float airResistance;
         bool hasSize;
         bool circular;
-        Punkt size;
+        Point size;
     };
 
     class Object2D : public virtual ReferenceCounter
@@ -98,14 +98,14 @@ namespace Framework
         //! \param p The point
         //! \param ignoreTransparentFlag if 1, collisions with transparent
         //! polygons are also considered
-        DLLEXPORT virtual bool istPunktInnen(
+        DLLEXPORT virtual bool isPointInside(
             Vertex p, bool ignoreTransparentFlag = 0) const;
         //! Checks whether a line is inside the object
         //! \param a The start point of the line
         //! \param b The end point of the line
         //! \param ignoreTransparentFlag if 1, collisions with transparent
         //! polygons are also considered
-        DLLEXPORT virtual bool istLinieInnen(
+        DLLEXPORT virtual bool isLineInside(
             Vertex a, Vertex b, bool ignoreTransparentFlag = 0) const;
         //! Checks whether the object intersects with another
         //! \param zObj A pointer to the other object without increased reference
@@ -113,7 +113,7 @@ namespace Framework
         //! point is stored \param end 0 if all corners of both objects should be
         //! checked. 1 if only the points of this model should be searched
         //! in the other
-        DLLEXPORT virtual bool istModelInnen(const Object2D* zObj,
+        DLLEXPORT virtual bool isModelInside(const Object2D* zObj,
             Vertex* sp = 0,
             bool end = 0,
             bool ignoreTransparent = 0) const;
@@ -173,7 +173,7 @@ namespace Framework
         WorldInfo info;
 
         void render(Mat3<float>& kamMat,
-            Punkt size,
+            Point size,
             Image& zRObj,
             int xOffset,
             int yOffset,
@@ -198,7 +198,7 @@ namespace Framework
         DLLEXPORT void impuls(Vertex worldPos, Vertex worldDir);
         DLLEXPORT bool tick(double zeit);
         DLLEXPORT void render(
-            Mat3<float>& kamMat, Punkt size, Image& zRObj, const char* kamName);
+            Mat3<float>& kamMat, Point size, Image& zRObj, const char* kamName);
         DLLEXPORT const WorldInfo& getWorldInfo() const;
         DLLEXPORT ArrayIterator<Object2D*> getMembers();
     };

World3D.cpp

@@ -151,7 +151,7 @@ void World3D::doMouseEvent(MouseEvent3D& me)
     //     if( ind >= 0 )
     //     {
     //         alphaVS[ ind ]->doMouseEvent( me );
-    //         if( me.verarbeitet )
+    //         if( me.processed )
     //         {
     //             cs.unlock();
     //             return;
@@ -242,10 +242,10 @@ void Framework::World3D::copyLight(DXBuffer* zDiffuse, DXBuffer* zPoints) const
 {
     zDiffuse->setData(diffuseLights);
     zDiffuse->setLength(diffuseLightCount * (int)sizeof(DiffuseLight));
-    zDiffuse->copieren();
+    zDiffuse->copyData();
     zPoints->setData(pointLights);
     zPoints->setLength(pointLightCount * (int)sizeof(PointLight));
-    zPoints->copieren();
+    zPoints->copyData();
 }
 
 //! adds a new diffuse light source

Writer.cpp

@@ -1,4 +1,4 @@
-#include "Writer.h"
+#include "Writer.h"
 
 using namespace Framework;
 
@@ -6,12 +6,12 @@ OStreamWriter::OStreamWriter(std::ostream& out)
     : out(out)
 {}
 
-void OStreamWriter::schreibe(const char* bytes, int len)
+void OStreamWriter::write(const char* bytes, int len)
 {
     out.write(bytes, (__int64)len);
 }
 
-bool OStreamWriter::istEnde() const
+bool OStreamWriter::isEnd() const
 {
     return out.eof();
 }

Writer.h

@@ -15,10 +15,10 @@ namespace Framework
         //! \param bytes An array containing the bytes to be written to the
         //! resource
         //! \param len How many bytes should be written to the resource
-        virtual void schreibe(const char* bytes, int len) = 0;
+        virtual void write(const char* bytes, int len) = 0;
         //! Checks whether the resource has been fully written
         //!  return 1 if the resource has been fully written. 0 otherwise
-        virtual bool istEnde() const = 0;
+        virtual bool isEnd() const = 0;
     };
 
     class Writer : public StreamWriter
@@ -43,8 +43,8 @@ namespace Framework
 
     public:
         __declspec(dllexport) OStreamWriter(std::ostream& out);
-        __declspec(dllexport) void schreibe(
+        __declspec(dllexport) void write(
             const char* bytes, int len) override;
-        __declspec(dllexport) bool istEnde() const override;
+        __declspec(dllexport) bool isEnd() const override;
     };
 } // namespace Framework

XML.cpp

@@ -48,7 +48,7 @@ Element::Element(Text string, Element* zParent)
         Text* tmp = string.getTeilText(1, nameEnd);
         name->setText(*tmp);
         tmp->release();
-        if (string.hatAt(
+        if (string.hasAt(
                 string.getLength() - 1 - name->getLength(), name->getText())
             || string[string.getLength() - 2] == '/')
         {
@@ -96,7 +96,7 @@ Element::Element(Text string, Element* zParent)
                         tmp = string.getTeilText(start, nameEnd - 1);
                         value.setText(*tmp);
                         tmp->release();
-                        value.ersetzen("\\\"", "\"");
+                        value.replace("\\\"", "\"");
                     }
                     if (string[nameEnd + 1] == '\'')
                     {
@@ -119,7 +119,7 @@ Element::Element(Text string, Element* zParent)
                         tmp = string.getTeilText(start, nameEnd - 1);
                         value.setText(*tmp);
                         tmp->release();
-                        value.ersetzen("\\'", "'");
+                        value.replace("\\'", "'");
                     }
                     setAttribute(attrName->getText(), value);
                 }
@@ -264,7 +264,7 @@ void Element::setAttribute(Text attribut, Text value)
     for (auto i = attributes->begin(), j = attributeValues->begin(); i && j;
         i++, j++)
     {
-        if (i->istGleich(attribut))
+        if (i->isEqual(attribut))
         {
             j->setText(value);
             return;
@@ -280,7 +280,7 @@ void Element::removeAttribute(Text attribut)
 {
     for (int i = 0; i < attributes->getEntryCount(); i++)
     {
-        if (attributes->z(i)->istGleich(attribut))
+        if (attributes->z(i)->isEqual(attribut))
         {
             attributes->remove(i);
             attributeValues->remove(i);
@@ -330,7 +330,7 @@ void Element::removeChild(int i)
 // Removes all children
 void Element::removeAllChilds()
 {
-    children->leeren();
+    children->clear();
 }
 
 // Removes a list of children
@@ -423,7 +423,7 @@ Editor Element::selectChildsByName(Text name) const
     RCArray<Element>* tmp = new RCArray<Element>();
     for (auto i : *children)
     {
-        if (i->getName().istGleich(name))
+        if (i->getName().isEqual(name))
             tmp->add(dynamic_cast<XML::Element*>(i->getThis()));
     }
     return Editor(tmp);
@@ -452,7 +452,7 @@ Editor Element::selectChildsByAttribute(Text attribute, Text value) const
     for (auto i : *children)
     {
         if (i->hasAttribute(attribute)
-            && i->getAttributeValue(attribute).istGleich(value))
+            && i->getAttributeValue(attribute).isEqual(value))
             tmp->add(dynamic_cast<XML::Element*>(i->getThis()));
     }
     return Editor(tmp);
@@ -463,7 +463,7 @@ bool Element::hasAttribute(Text name) const
 {
     for (auto i : *attributes)
     {
-        if (i->istGleich(name)) return 1;
+        if (i->isEqual(name)) return 1;
     }
     return 0;
 }
@@ -493,7 +493,7 @@ const Text& Element::getAttributeValue(const Text& attribut) const
     for (auto i = attributes->begin(), j = attributeValues->begin(); i && j;
         i++, j++)
     {
-        if (i->istGleich(attribut)) return *j.val();
+        if (i->isEqual(attribut)) return *j.val();
     }
     return Text::EMPTY;
 }
@@ -531,11 +531,11 @@ Text Element::toString() const
         i++, j++)
     {
         ret += i->getText();
-        if (j->hat('"'))
+        if (j->has('"'))
         {
             ret += "='";
             Text txt = j->getText();
-            txt.ersetzen("'", "\\'");
+            txt.replace("'", "\\'");
             ret += txt;
             ret += "'";
         }
@@ -543,7 +543,7 @@ Text Element::toString() const
         {
             ret += "=\"";
             Text txt = j->getText();
-            txt.ersetzen("\"", "\\\"");
+            txt.replace("\"", "\\\"");
             ret += txt;
             ret += "\"";
         }
@@ -739,7 +739,7 @@ Editor Editor::whereNameEquals(Text name) const
     RCArray<Element>* list = new RCArray<Element>();
     for (auto i : *elements)
     {
-        if (i->getName().istGleich(name))
+        if (i->getName().isEqual(name))
             list->add(dynamic_cast<XML::Element*>(i->getThis()));
     }
     return Editor(list);
@@ -809,7 +809,7 @@ Editor Editor::whereAttributeEquals(Text attribute, Text value) const
     for (auto i : *elements)
     {
         if (i->hasAttribute(attribute)
-            && i->getAttributeValue(attribute).istGleich(value))
+            && i->getAttributeValue(attribute).isEqual(value))
             list->add(dynamic_cast<XML::Element*>(i->getThis()));
     }
     return Editor(list);
@@ -855,7 +855,7 @@ DLLEXPORT Editor& Framework::XML::Editor::operator=(const Editor& e)
 {
     if (this != &e)
     {
-        this->elements->leeren();
+        this->elements->clear();
         for (auto i : *e.elements)
             this->elements->add(dynamic_cast<XML::Element*>(i->getThis()));
     }

d3dx12.h

@@ -1,4 +1,4 @@
-//*********************************************************
+//*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
@@ -410,7 +410,7 @@ struct CD3DX12_RASTERIZER_DESC : public D3D12_RASTERIZER_DESC
         BOOL multisampleEnable,
         BOOL antialiasedLineEnable,
         UINT forcedSampleCount,
-        D3D12_CONSERVATIVE_RASTERIZATION_MODE conservativeRaster) noexcept
+        D3D12_CONSERVATIVE_RASTERIZATION_MODE conservativeGrid) noexcept
     {
         FillMode = fillMode;
         CullMode = cullMode;
@@ -422,7 +422,7 @@ struct CD3DX12_RASTERIZER_DESC : public D3D12_RASTERIZER_DESC
         MultisampleEnable = multisampleEnable;
         AntialiasedLineEnable = antialiasedLineEnable;
         ForcedSampleCount = forcedSampleCount;
-        ConservativeRaster = conservativeRaster;
+        ConservativeRaster = conservativeGrid;
     }
 };