diff --git a/.gitignore b/.gitignore index fa0d059..7e640e3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ *.rsuser *.suo *.user +*.user.* *.userosscache *.sln.docstates @@ -69,4 +70,4 @@ compile_commands.json inno/*.exe # Docs -docs/ \ No newline at end of file +docs/ diff --git a/src/app/datafilebase.cpp b/src/app/datafilebase.cpp index 68d3752..cda69a9 100644 --- a/src/app/datafilebase.cpp +++ b/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; } -} \ No newline at end of file +} diff --git a/src/database/sqldatabase.cpp b/src/database/sqldatabase.cpp index 9243f24..42c09fe 100644 --- a/src/database/sqldatabase.cpp +++ b/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(context.getUserData())) }; + const SqliteCustomFunction& func{ *(static_cast(context.getUserData())) }; func(context); }, nullptr, nullptr) == SQLITE_OK; } @@ -219,4 +219,4 @@ namespace Nickvision::Database std::lock_guard lock{ m_mutex }; return m_database.operator bool() && (m_isEncrypted ? m_isUnlocked : true); } -} \ No newline at end of file +} diff --git a/src/database/sqlstatement.cpp b/src/database/sqlstatement.cpp index 98dacc8..0dc70ff 100644 --- a/src/database/sqlstatement.cpp +++ b/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(sqlite3_column_bytes(m_statement.get(), index)) }; + return { reinterpret_cast(sqlite3_column_text(m_statement.get(), index), static_cast(sqlite3_column_bytes(m_statement.get(), index))) }; } std::pair SqlStatement::getColumnBlob(int index) const @@ -90,4 +90,4 @@ namespace Nickvision::Database { return m_statement.operator bool(); } -} \ No newline at end of file +} diff --git a/src/database/sqlvalue.cpp b/src/database/sqlvalue.cpp index 34f6b04..fa2a5af 100644 --- a/src/database/sqlvalue.cpp +++ b/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(sqlite3_value_bytes(m_value)) }; + return { reinterpret_cast(sqlite3_value_text(m_value), static_cast(sqlite3_value_bytes(m_value))) }; } std::pair SqlValue::getBlob() const { return { sqlite3_value_blob(m_value), static_cast(sqlite3_value_bytes(m_value)) }; } -} \ No newline at end of file +} diff --git a/src/filesystem/userdirectories.cpp b/src/filesystem/userdirectories.cpp index 007918a..40c65b8 100644 --- a/src/filesystem/userdirectories.cpp +++ b/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; } -} \ No newline at end of file +} diff --git a/src/network/curleasy.cpp b/src/network/curleasy.cpp index 9baeed3..7789583 100644 --- a/src/network/curleasy.cpp +++ b/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(data)) }; + const CurlProgressFunction& func{ *(static_cast(data)) }; return func(dltotal, dlnow, ultotal, ulnow); } @@ -188,4 +188,4 @@ namespace Nickvision::Network #endif return true; } -} \ No newline at end of file +} diff --git a/src/system/process.cpp b/src/system/process.cpp index a166911..144e7e9 100644 --- a/src/system/process.cpp +++ b/src/system/process.cpp @@ -305,4 +305,4 @@ namespace Nickvision::System lock.unlock(); m_exited.invoke({ m_exitCode, m_output }); } -} \ No newline at end of file +} diff --git a/tests/datafiletests.cpp b/tests/datafiletests.cpp index eba0e02..cce575e 100644 --- a/tests/datafiletests.cpp +++ b/tests/datafiletests.cpp @@ -97,7 +97,7 @@ std::shared_ptr DataFileTest::m_manager{ nullptr }; TEST_F(DataFileTest, EnsureDefaultAppConfig) { - AppConfig& config{ m_manager->get("config") }; + const AppConfig& config{ m_manager->get("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("config") }; + const AppConfig& config{ m_manager->get("config") }; ASSERT_EQ(config.getTheme(), Theme::Light); WindowGeometry geometry{ config.getWindowGeometry() }; ASSERT_EQ(geometry.getWidth(), 1920); @@ -133,7 +133,7 @@ TEST_F(DataFileTest, ChangeAppConfig2) TEST_F(DataFileTest, EnsureChangeInAppConfig2) { - AppConfig& config{ m_manager->get("config") }; + const AppConfig& config{ m_manager->get("config") }; ASSERT_EQ(config.getAutomaticallyCheckForUpdates(), false); } @@ -141,11 +141,11 @@ TEST_F(DataFileTest, ReloadConfig) { m_manager.reset(); m_manager = std::make_shared("Nickvision Aura Tests"); - AppConfig& config{ m_manager->get("config") }; + const AppConfig& config{ m_manager->get("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); -} \ No newline at end of file +}