Fix old casts.

5 files changed, 29 insertions, 23 deletions

diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 90e0c5c93..763b579d0 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -442,9 +442,15 @@ bool runxsel(std::string& text, const char *p1, const char *p2)
             close(fd[0]);
         }
         if (p2)
-            execl("/usr/bin/xsel", "xsel", p1, p2, (char *)nullptr);
+        {
+            execl("/usr/bin/xsel", "xsel", p1, p2,
+                static_cast<char *>(nullptr));
+        }
         else
-            execl("/usr/bin/xsel", "xsel", p1, (char *)nullptr);
+        {
+            execl("/usr/bin/xsel", "xsel", p1,
+                static_cast<char *>(nullptr));
+        }
 
         exit(1);
     }
diff --git a/src/utils/langs.cpp b/src/utils/langs.cpp
index 2efbd781a..c1f9f7ecf 100644
--- a/src/utils/langs.cpp
+++ b/src/utils/langs.cpp
@@ -44,11 +44,11 @@ std::vector<std::string> getLang()
     }
 
     int dot = lang.find(".");
-    if (dot != (signed)std::string::npos)
+    if (dot != static_cast<signed>(std::string::npos))
         lang = lang.substr(0, dot);
     langs.push_back(lang);
     dot = lang.find("_");
-    if (dot != (signed)std::string::npos)
+    if (dot != static_cast<signed>(std::string::npos))
         langs.push_back(lang.substr(0, dot));
     return langs;
 }
@@ -78,10 +78,10 @@ std::string getLangShort()
     }
 
     int dot = lang.find(".");
-    if (dot != (signed)std::string::npos)
+    if (dot != static_cast<signed>(std::string::npos))
         lang = lang.substr(0, dot);
     dot = lang.find("_");
-    if (dot != (signed)std::string::npos)
+    if (dot != static_cast<signed>(std::string::npos))
         return lang.substr(0, dot);
     return lang;
 }
diff --git a/src/utils/physfsrwops.cpp b/src/utils/physfsrwops.cpp
index 1960f0dee..2675b89ae 100644
--- a/src/utils/physfsrwops.cpp
+++ b/src/utils/physfsrwops.cpp
@@ -29,7 +29,7 @@
 
 static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
 {
-    PHYSFS_file *handle = (PHYSFS_file *) rw->hidden.unknown.data1;
+    PHYSFS_file *handle = static_cast<PHYSFS_file *>(rw->hidden.unknown.data1);
     int pos = 0;
 
     if (whence == SEEK_SET)
@@ -46,8 +46,8 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
             return -1;
         } /* if */
 
-        pos = (int)current;
-        if (((PHYSFS_sint64)pos) != current)
+        pos = static_cast<int>(current);
+        if (static_cast<PHYSFS_sint64>(pos) != current)
         {
             SDL_SetError("Can't fit current file position in an int!");
             return -1;
@@ -67,8 +67,8 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
             return -1;
         } /* if */
 
-        pos = (int)len;
-        if (((PHYSFS_sint64)pos) != len)
+        pos = static_cast<int>(len);
+        if (static_cast<PHYSFS_sint64>(pos) != len)
         {
             SDL_SetError("Can't fit end-of-file position in an int!");
             return -1;
@@ -88,7 +88,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
         return -1;
     } /* if */
 
-    if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos))
+    if (!PHYSFS_seek(handle, static_cast<PHYSFS_uint64>(pos)))
     {
         SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
         return -1;
@@ -99,7 +99,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
 
 static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum)
 {
-    PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1;
+    PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1);
     PHYSFS_sint64 rc = PHYSFS_read(handle, ptr, size, maxnum);
     if (rc != maxnum)
     {
@@ -107,22 +107,22 @@ static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum)
             SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
     } /* if */
 
-    return (int)rc;
+    return static_cast<int>(rc);
 } /* physfsrwops_read */
 
 static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num)
 {
-    PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1;
+    PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1);
     PHYSFS_sint64 rc = PHYSFS_write(handle, ptr, size, num);
     if (rc != num)
         SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
 
-    return (int) rc;
+    return static_cast<int>(rc);
 } /* physfsrwops_write */
 
 static int physfsrwops_close(SDL_RWops *rw)
 {
-    PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1;
+    PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1);
     if (!PHYSFS_close(handle))
     {
         SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index fd0ec0fa8..0106c597d 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -112,12 +112,12 @@ int execFile(std::string pathName, std::string name,
             if (arg2.empty())
             {
                 execl(pathName.c_str(), name.c_str(),
-                      arg1.c_str(), (char *)nullptr);
+                   arg1.c_str(), static_cast<char *>(nullptr));
             }
             else
             {
-                execl(pathName.c_str(), name.c_str(),
-                      arg1.c_str(), arg2.c_str(), (char *)nullptr);
+                execl(pathName.c_str(), name.c_str(), arg1.c_str(),
+                    arg2.c_str(), static_cast<char *>(nullptr));
             }
             exit(-1);
         }
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 2f478a909..5a7ea87fd 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -522,9 +522,9 @@ std::string stringToHexPath(const std::string &str)
     if (str.empty())
         return "";
 
-    std::string hex = strprintf("%%%2x/", (int)str[0]);
+    std::string hex = strprintf("%%%2x/", static_cast<int>(str[0]));
     for (unsigned f = 1; f < str.size(); f ++)
-        hex += strprintf("%%%2x", (int)str[f]);
+        hex += strprintf("%%%2x", static_cast<int>(str[f]));
     return hex;
 }
 
@@ -600,7 +600,7 @@ bool findCutFirst(std::string &str1, std::string str2)
 std::string &removeProtocol(std::string &url)
 {
     int i = url.find("://");
-    if (i != (int)std::string::npos)
+    if (i != static_cast<int>(std::string::npos))
         url = url.substr(i + 3);
     return url;
 }