diff --git a/cfg/std.cfg b/cfg/std.cfg
index 3c2e40329..07a962515 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -88,6 +88,7 @@
   <!-- char *asctime(const struct tm *tm) -->
   <function name="asctime,std::asctime">
     <use-retval/>
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -668,6 +669,7 @@
   <!-- char * ctime(const time_t *tp); -->
   <function name="ctime,std::ctime">
     <use-retval/>
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -1299,6 +1301,7 @@
   <!-- char * fgets(char *buffer, int n, FILE *stream); -->
   <function name="fgets,std::fgets">
     <noreturn>false</noreturn>
+    <returnValue type="char *"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1553,6 +1556,7 @@
   <!-- char * getenv(const char *name); -->
   <function name="getenv,std::getenv">
     <use-retval/>
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -1564,6 +1568,7 @@
   <!-- char *gets(char *buffer); -->
   <function name="gets,std::gets">
     <noreturn>false</noreturn>
+    <returnValue type="char *"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -1574,6 +1579,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- char *gets_s(char *buffer, rsize_t size); -->
   <function name="gets_s,std::gets_s">
     <noreturn>false</noreturn>
+    <returnValue type="char *"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -3104,6 +3110,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char * strcat(char *deststr, const char *srcstr); -->
   <function name="strcat,std::strcat">
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3143,6 +3150,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- char * strchr(const char *cs, int c); -->
   <function name="strchr,std::strchr">
     <use-retval/>
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3204,6 +3212,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char *strcpy(char *desstr, const char *srcstr); -->
   <function name="strcpy,std::strcpy">
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3268,6 +3277,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char *strncpy(char *s, const char *ct, size_t n); -->
   <function name="strncpy,std::strncpy">
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3288,6 +3298,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- char * strpbrk(const char *cs, const char *ct); -->
   <function name="strpbrk,std::strpbrk">
     <use-retval/>
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3302,6 +3313,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- char * strncat(char *ct, const char *s, size_t n); -->
   <function name="strncat,std::strncat">
     <noreturn>false</noreturn>
+    <returnValue type="char *"/>
     <leak-ignore/>
     <arg nr="1">
       <not-null/>
@@ -3384,6 +3396,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- char* strstr(const char *s1, const char *s2); -->
   <function name="strstr,std::strstr">
     <use-retval/>
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3496,6 +3509,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- char * strerror(int errornum); -->
   <function name="strerror,std::strerror">
     <use-retval/>
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3597,6 +3611,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- char * strrchr(char * str, int character); -->
   <function name="strrchr,std::strrchr">
     <use-retval/>
+    <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -3612,6 +3627,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- const char * strpbrk(const char * str1, const char * str2);-->
   <!-- char * strpbrk(char * str1, const char * str2); -->
   <function name="strbprk">
+    <returnValue type="char *"/>
     <use-retval/>
     <pure/>
     <noreturn>false</noreturn>
@@ -3658,6 +3674,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char *strtok(char *s, const char *ct); -->
   <function name="strtok,std::strtok">
+    <returnValue type="char *"/>
     <pure/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -3726,6 +3743,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- char *tmpnam(char *s); -->
   <function name="tmpnam,std::tmpnam">
     <noreturn>false</noreturn>
+    <returnValue type="char *"/>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
@@ -4319,6 +4337,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- size_t find (const char* s, size_t pos = 0) const; -->
   <function name="std::string::find,std::wstring::find,std::basic_string::find">
     <noreturn>false</noreturn>
+    <returnValue type="size_t"/>
     <leak-ignore/>
     <use-retval/>
     <arg nr="1">
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
index 831734bf1..103a473e6 100644
--- a/gui/threadhandler.cpp
+++ b/gui/threadhandler.cpp
@@ -134,9 +134,9 @@ void ThreadHandler::removeThreads()
     for (int i = 0; i < mThreads.size(); i++) {
         mThreads[i]->terminate();
         disconnect(mThreads[i], &CheckThread::done,
-                this, &ThreadHandler::threadDone);
+                   this, &ThreadHandler::threadDone);
         disconnect(mThreads[i], &CheckThread::fileChecked,
-                &mResults, &ThreadResult::fileChecked);
+                   &mResults, &ThreadResult::fileChecked);
         delete mThreads[i];
     }