fix MISRA 15.5 in binary.hpp and use .hpp instead of .h and fix Rule 3.1 form link using // and more

Author: noisecode3

CMakeLists.txt

@@ -32,28 +32,28 @@ endif()
 add_subdirectory(libs/miniz)
 
 set(SOURCES_TESTS
-    test/test.h
+    test/test.hpp
 )
 
 set(SOURCES_MC
     src/main.cpp
-    src/binary.h
-    src/gameTree.h
-    src/staticData.h
-    src/Network.h
+    src/binary.hpp
+    src/gameTree.hpp
+    src/staticData.hpp
+    src/Network.hpp
     src/Network.cpp
-    src/Controller.h
+    src/Controller.hpp
     src/Controller.cpp
-    src/FileManager.h
+    src/FileManager.hpp
     src/FileManager.cpp
-    src/Model.h
+    src/Model.hpp
     src/Model.cpp
-    src/Data.h
+    src/Data.hpp
     src/Data.cpp
 )
 
 set(SOURCES_VIEW
-    src/TombRaiderLinuxLauncher.h
+    src/TombRaiderLinuxLauncher.hpp
     src/TombRaiderLinuxLauncher.cpp
     src/TombRaiderLinuxLauncher.ui
     src/resources.qrc

src/Controller.cpp

@@ -9,12 +9,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Controller.h"
+#include "Controller.hpp"
 #include <QDebug>
 
 Controller::Controller(QObject *parent)

src/Controller.h src/Controller.hppsrc/Controller.h renamed to src/Controller.hpp

@@ -9,16 +9,13 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SRC_CONTROLLER_H_
-#define SRC_CONTROLLER_H_
+#ifndef SRC_CONTROLLER_HPP_
+#define SRC_CONTROLLER_HPP_
 #include <QObject>
 #include <QThread>
-#include "Model.h"
+#include "Model.hpp"
 
 /**
  * The controller activate UI thread work or light instant work on the model
@@ -70,4 +67,4 @@ class Controller : public QObject {
     Q_DISABLE_COPY(Controller)
 };
 
-#endif  // SRC_CONTROLLER_H_
+#endif  // SRC_CONTROLLER_HPP_

src/Data.cpp

@@ -9,12 +9,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Data.h"
+#include "Data.hpp"
 
 QVector<ListItemData> Data::getListItems() {
     QVector<ListItemData> items;

src/Data.h src/Data.hppsrc/Data.h renamed to src/Data.hpp

@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SRC_DATA_H_
-#define SRC_DATA_H_
+#ifndef SRC_DATA_HPP_
+#define SRC_DATA_HPP_
 
 #include <QObject>
 #include <QSqlDatabase>
@@ -181,4 +178,4 @@ class Data : public QObject {
     Q_DISABLE_COPY(Data)
 };
 
-#endif  // SRC_DATA_H_
+#endif  // SRC_DATA_HPP_

src/FileManager.cpp

@@ -9,12 +9,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "FileManager.h"
+#include "FileManager.hpp"
 #include <QFile>
 #include <QIODevice>
 #include <QDir>
@@ -23,7 +20,7 @@
 #include <QtCore>
 #include <QByteArray>
 #include <QDataStream>
-#include "gameTree.h"
+#include "gameTree.hpp"
 
 bool FileManager::setUpCamp(const QString& levelDir, const QString& gameDir) {
     QDir levelDirPath(levelDir);
@@ -52,19 +49,26 @@ const QString FileManager::calculateMD5(const QString& file, bool lookGameDir) {
         gameDir_m.absolutePath() + QDir::separator()+file :
         levelDir_m.absolutePath() + QDir::separator()+file;
 
+    QFileInfo fileInfo(path);
+
+    if (fileInfo.exists() && !fileInfo.isFile()) {
+        qDebug() << "Error: The path is not a regular file." << path;
+        return"";
+    }
+
     QFile f(path);
-    if (!f.open(QIODevice::ReadOnly)) {
+    if (!f.open(QIODevice::ReadOnly)) {  // flawfinder: ignore
         qDebug() << "Error opening file for reading: " << f.errorString();
         return "";
     }
 
     QCryptographicHash md5(QCryptographicHash::Md5);
 
-    char buffer[1024];
+    std::array<char, 1024> buffer;
     qint64 bytesRead;
 
-    while ((bytesRead = f.read(buffer, sizeof(buffer))) > 0) {
-        md5.addData(buffer, static_cast<int>(bytesRead));
+    while ((bytesRead = f.read(buffer.data(), buffer.size())) > 0) {
+        md5.addData(buffer.data(), static_cast<int>(bytesRead));
     }
 
     f.close();

src/FileManager.h src/FileManager.hppsrc/FileManager.h renamed to src/FileManager.hpp

@@ -9,13 +9,10 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SRC_FILEMANAGER_H_
-#define SRC_FILEMANAGER_H_
+#ifndef SRC_FILEMANAGER_HPP_
+#define SRC_FILEMANAGER_HPP_
 
 #include <QString>
 #include <QObject>
@@ -72,4 +69,4 @@ class FileManager : public QObject {
     QDir gameDir_m;
     Q_DISABLE_COPY(FileManager)
 };
-#endif  // SRC_FILEMANAGER_H_
+#endif  // SRC_FILEMANAGER_HPP_

src/Model.cpp

@@ -9,12 +9,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Model.h"
+#include "Model.hpp"
 
 // Those lambda should be in another header file
 Model::Model(QObject *parent) : QObject(parent), checkCommonFilesIndex_m(1) {

src/Model.h src/Model.hppsrc/Model.h renamed to src/Model.hpp

@@ -9,22 +9,19 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SRC_MODEL_H_
-#define SRC_MODEL_H_
+#ifndef SRC_MODEL_HPP_
+#define SRC_MODEL_HPP_
 
 #include <QObject>
 #include <QMap>
 #include <QDebug>
 #include <QtCore>
-#include <assert.h>
-#include "Data.h"
-#include "FileManager.h"
-#include "Network.h"
+#include <cassert>
+#include "Data.hpp"
+#include "FileManager.hpp"
+#include "Network.hpp"
 
 class InstructionManager : public QObject {
     Q_OBJECT
@@ -53,11 +50,10 @@ class Model : public QObject {
     Q_OBJECT
 
  public:
-    static Model& getInstance()
-    {
+    static Model& getInstance() {
         static Model instance;
         return instance;
-    };
+    }
     void checkCommonFiles();
     int checkGameDirectory(int id);
     int checkLevelDirectory(int id);
@@ -90,4 +86,4 @@ class Model : public QObject {
     Q_DISABLE_COPY(Model)
 };
 
-#endif  // SRC_MODEL_H_
+#endif  // SRC_MODEL_HPP_

src/Network.cpp

@@ -9,12 +9,9 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Network.h"
+#include "Network.hpp"
 #include <curl/curl.h>
 #include <cstdio>
 #include <iostream>
@@ -78,7 +75,7 @@ std::string get_ssl_certificate(const std::string& host) {
 }
 
 struct WriteData {
-    Downloader* downloader;  // cppcheck-suppress unusedStructMember
+    Downloader* downloader;
     FILE* file;
 };