cppcheck Fixes

.gitignore

@@ -35,6 +35,7 @@
 *.rsuser
 *.suo
 *.user
+*.user.*
 *.userosscache
 *.sln.docstates
 
@@ -69,4 +70,4 @@ compile_commands.json
 inno/*.exe
 
 # Docs
-docs/
+docs/

src/app/datafilebase.cpp

@@ -23,9 +23,9 @@ namespace Nickvision::App
         {
             std::ifstream in{ m_path };
             boost::json::stream_parser parser;
-            std::string line;
             try
             {
+                std::string line;
                 while(std::getline(in, line))
                 {
                     parser.write(line);
@@ -58,4 +58,4 @@ namespace Nickvision::App
         m_saved({});
         return true;
     }
-}
+}

src/database/sqldatabase.cpp

@@ -181,7 +181,7 @@ namespace Nickvision::Database
         return sqlite3_create_function(m_database.get(), name.c_str(), expectedArgs, SQLITE_UTF8, &m_custom[name], +[](sqlite3_context* ctx, int argc, sqlite3_value** argv)
         {
             SqlContext context{ ctx, argc, argv };
-            SqliteCustomFunction& func{ *(static_cast<SqliteCustomFunction*>(context.getUserData())) };
+            const SqliteCustomFunction& func{ *(static_cast<SqliteCustomFunction*>(context.getUserData())) };
             func(context);
         }, nullptr, nullptr) == SQLITE_OK;
     }
@@ -219,4 +219,4 @@ namespace Nickvision::Database
         std::lock_guard<std::mutex> lock{ m_mutex };
         return m_database.operator bool() && (m_isEncrypted ? m_isUnlocked : true);
     }
-}
+}

src/database/sqlstatement.cpp

@@ -78,7 +78,7 @@ namespace Nickvision::Database
 
     std::string SqlStatement::getColumnString(int index) const
     {
-        return { (const char*)sqlite3_column_text(m_statement.get(), index), static_cast<size_t>(sqlite3_column_bytes(m_statement.get(), index)) };
+        return { reinterpret_cast<const char*>(sqlite3_column_text(m_statement.get(), index), static_cast<size_t>(sqlite3_column_bytes(m_statement.get(), index))) };
     }
 
     std::pair<const void*, size_t> SqlStatement::getColumnBlob(int index) const
@@ -90,4 +90,4 @@ namespace Nickvision::Database
     {
         return m_statement.operator bool();
     }
-}
+}

src/database/sqlvalue.cpp

@@ -30,11 +30,11 @@ namespace Nickvision::Database
 
     std::string SqlValue::getString() const
     {
-        return { (const char*)sqlite3_value_text(m_value), static_cast<size_t>(sqlite3_value_bytes(m_value)) };
+        return { reinterpret_cast<const char*>(sqlite3_value_text(m_value), static_cast<size_t>(sqlite3_value_bytes(m_value))) };
     }
 
     std::pair<const void*, size_t> SqlValue::getBlob() const
     {
         return { sqlite3_value_blob(m_value), static_cast<size_t>(sqlite3_value_bytes(m_value)) };
     }
-}
+}

src/filesystem/userdirectories.cpp

@@ -46,7 +46,7 @@ namespace Nickvision::Filesystem
         std::string line;
         while (std::getline(dirs, line))
         {
-            if (line[0] == '#' || line.empty())
+            if (line.empty() || line[0] == '#')
             {
                 continue;
             }
@@ -236,4 +236,4 @@ namespace Nickvision::Filesystem
         std::filesystem::create_directories(result);
         return result;
     }
-}
+}

src/network/curleasy.cpp

@@ -15,7 +15,7 @@ namespace Nickvision::Network
 
     static int progressCallback(void* data, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
     {
-        CurlProgressFunction& func{ *(static_cast<CurlProgressFunction*>(data)) };
+        const CurlProgressFunction& func{ *(static_cast<CurlProgressFunction*>(data)) };
         return func(dltotal, dlnow, ultotal, ulnow);
     }
 
@@ -188,4 +188,4 @@ namespace Nickvision::Network
 #endif
         return true;
     }
-}
+}

src/system/process.cpp

@@ -305,4 +305,4 @@ namespace Nickvision::System
         lock.unlock();
         m_exited.invoke({ m_exitCode, m_output });
     }
-}
+}

tests/datafiletests.cpp

@@ -97,7 +97,7 @@ std::shared_ptr<DataFileManager> DataFileTest::m_manager{ nullptr };
 
 TEST_F(DataFileTest, EnsureDefaultAppConfig)
 {
-    AppConfig& config{ m_manager->get<AppConfig>("config") };
+    const AppConfig& config{ m_manager->get<AppConfig>("config") };
     WindowGeometry geometry{ config.getWindowGeometry() };
     ASSERT_EQ(config.getTheme(), Theme::System);
     ASSERT_EQ(geometry.getWidth(), 800);
@@ -116,7 +116,7 @@ TEST_F(DataFileTest, ChangeAppConfig1)
 
 TEST_F(DataFileTest, EnsureChangeInAppConfig)
 {
-    AppConfig& config{ m_manager->get<AppConfig>("config") };
+    const AppConfig& config{ m_manager->get<AppConfig>("config") };
     ASSERT_EQ(config.getTheme(), Theme::Light);
     WindowGeometry geometry{ config.getWindowGeometry() };
     ASSERT_EQ(geometry.getWidth(), 1920);
@@ -133,19 +133,19 @@ TEST_F(DataFileTest, ChangeAppConfig2)
 
 TEST_F(DataFileTest, EnsureChangeInAppConfig2)
 {
-    AppConfig& config{ m_manager->get<AppConfig>("config") };
+    const AppConfig& config{ m_manager->get<AppConfig>("config") };
     ASSERT_EQ(config.getAutomaticallyCheckForUpdates(), false);
 }
 
 TEST_F(DataFileTest, ReloadConfig)
 {
     m_manager.reset();
     m_manager = std::make_shared<DataFileManager>("Nickvision Aura Tests");
-    AppConfig& config{ m_manager->get<AppConfig>("config") };
+    const AppConfig& config{ m_manager->get<AppConfig>("config") };
     ASSERT_EQ(config.getTheme(), Theme::Light);
     WindowGeometry geometry{ config.getWindowGeometry() };
     ASSERT_EQ(geometry.getWidth(), 1920);
     ASSERT_EQ(geometry.getHeight(), 1080);
     ASSERT_EQ(geometry.isMaximized(), true);
     ASSERT_EQ(config.getAutomaticallyCheckForUpdates(), false);
-}
+}