Merge branch 'dev' into 'dev-stupidrenderer'

# Conflicts:
#   src/Image/IntelliImage.cpp
#   src/Image/IntelliRasterImage.cpp
#   src/Image/IntelliShapedImage.cpp
#   src/Layer/PaintingArea.cpp

src/Image/IntelliImage.cpp

@@ -24,7 +24,7 @@ bool IntelliImage::loadImage(const QString &filePath){
 		QImage loadedImage;
 
 		// If the image wasn't loaded leave this function
-        if (!loadedImage.load(filePath))
+		if (!loadedImage.load(filePath))
 				return false;
 
 		// scaled Image to size of Layer

src/Image/IntelliImage.h

@@ -24,8 +24,8 @@ public:
  * \brief The Types, which an Image can be.
  */
 enum class ImageType {
-        Raster_Image,
-        Shaped_Image
+		RASTERIMAGE,
+		SHAPEDIMAGE
 };
 
 protected:
@@ -132,7 +132,7 @@ virtual std::vector<QPoint> getPolygonData(){
 }
 
 virtual ImageType getTypeOfImage(){
-    return TypeOfImage;
+		return TypeOfImage;
 }
 
 /*!

src/Image/IntelliRasterImage.cpp

@@ -16,7 +16,7 @@ IntelliRasterImage::~IntelliRasterImage(){
 IntelliImage* IntelliRasterImage::getDeepCopy(){
         IntelliRasterImage* raster = new IntelliRasterImage(imageData.width(), imageData.height(), false);
 		raster->imageData.fill(Qt::transparent);
-        raster->TypeOfImage = IntelliImage::ImageType::Raster_Image;
+		raster->TypeOfImage = IntelliImage::ImageType::RASTERIMAGE;
 		return raster;
 }
 

src/Image/IntelliShapedImage.cpp

@@ -22,7 +22,7 @@ IntelliImage* IntelliShapedImage::getDeepCopy(){
         IntelliShapedImage* shaped = new IntelliShapedImage(imageData.width(), imageData.height(), false);
 		shaped->setPolygon(this->polygonData);
 		shaped->imageData.fill(Qt::transparent);
-        shaped->TypeOfImage = IntelliImage::ImageType::Shaped_Image;
+		shaped->TypeOfImage = IntelliImage::ImageType::SHAPEDIMAGE;
 		return shaped;
 }