diff --git a/src/Profile.cpp b/src/Profile.cpp
index 5b317b34..fab384d6 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -124,7 +124,7 @@ const Profile::PropertyInfo Profile::DefaultPropertyNames[] = {
     // Encoding
     , { DefaultEncoding , "DefaultEncoding" , ENCODING_GROUP , QVariant::String }
 
-    , { (Property)0 , nullptr , nullptr, QVariant::Invalid }
+    , { static_cast<Profile::Property>(0) , nullptr , nullptr, QVariant::Invalid }
 };
 
 QHash<QString, Profile::PropertyInfo> Profile::PropertyInfoByName;
diff --git a/src/Screen.cpp b/src/Screen.cpp
index 87f3e6b0..04ea1372 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -486,7 +486,7 @@ QVector<LineProperty> Screen::getLineProperties(int startLine , int endLine) con
     for (int line = startLine; line < startLine + linesInHistory; line++) {
         //TODO Support for line properties other than wrapped _lines
         if (_history->isWrappedLine(line)) {
-            result[index] = (LineProperty)(result[index] | LINE_WRAPPED);
+            result[index] = static_cast<LineProperty>(result[index] | LINE_WRAPPED);
         }
         index++;
     }
@@ -668,7 +668,7 @@ void Screen::displayCharacter(unsigned short c)
 
     if (_cuX + w > _columns) {
         if (getMode(MODE_Wrap)) {
-            _lineProperties[_cuY] = (LineProperty)(_lineProperties[_cuY] | LINE_WRAPPED);
+            _lineProperties[_cuY] = static_cast<LineProperty>(_lineProperties[_cuY] | LINE_WRAPPED);
             nextLine();
         } else {
             _cuX = _columns - w;
@@ -1386,9 +1386,9 @@ const HistoryType& Screen::getScroll() const
 void Screen::setLineProperty(LineProperty property , bool enable)
 {
     if (enable)
-        _lineProperties[_cuY] = (LineProperty)(_lineProperties[_cuY] | property);
+        _lineProperties[_cuY] = static_cast<LineProperty>(_lineProperties[_cuY] | property);
     else
-        _lineProperties[_cuY] = (LineProperty)(_lineProperties[_cuY] & ~property);
+        _lineProperties[_cuY] = static_cast<LineProperty>(_lineProperties[_cuY] & ~property);
 }
 void Screen::fillWithDefaultChar(Character* dest, int count)
 {