Fix missed ErrorMessage constructor changes

Author: GNL10

gui/checkthread.cpp

@@ -426,7 +426,7 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
         const std::string f0 = file0.toStdString();
         const std::string msg = e.message.toStdString();
         const std::string id = e.errorId.toStdString();
-        ErrorMessage errmsg(std::move(callstack), f0, e.severity, msg, id, Certainty::normal);
+        ErrorMessage errmsg(std::move(callstack), f0, e.severity, id, msg, Certainty::normal);
         mResult.reportErr(errmsg);
     }
 }

lib/cppcheck.cpp

@@ -1601,8 +1601,8 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
                 const ErrorMessage errmsg({},
                                           "",
                                           Severity::error,
-                                          msg,
                                           "pcre_compile",
+                                          msg,
                                           Certainty::normal);
 
                 mErrorLogger.reportErr(errmsg);
@@ -1622,8 +1622,8 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
             const ErrorMessage errmsg({},
                                       "",
                                       Severity::error,
-                                      msg,
                                       "pcre_study",
+                                      msg,
                                       Certainty::normal);
 
             mErrorLogger.reportErr(errmsg);
@@ -1645,8 +1645,8 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
                     const ErrorMessage errmsg({},
                                               "",
                                               Severity::error,
-                                              std::string("pcre_exec failed: ") + errorMessage,
                                               "pcre_exec",
+                                              std::string("pcre_exec failed: ") + errorMessage,
                                               Certainty::normal);
 
                     mErrorLogger.reportErr(errmsg);
@@ -1681,8 +1681,8 @@ void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
             const ErrorMessage errmsg({std::move(loc)},
                                       list.getSourceFilePath(),
                                       rule.severity,
-                                      !rule.summary.empty() ? rule.summary : "found '" + str.substr(pos1, pos2 - pos1) + "'",
                                       rule.id,
+                                      !rule.summary.empty() ? rule.summary : "found '" + str.substr(pos1, pos2 - pos1) + "'",
                                       Certainty::normal);
 
             // Report error