From e015f5b08667ea5aa66fc5c0f748629d6acee8a3 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 15 Aug 2022 23:43:30 +0100 Subject: [PATCH] Formatting. --- .../3d_viewer/eda_3d_viewer_settings.cpp | 13 +++++++------ common/settings/app_settings.cpp | 1 - common/settings/color_settings.cpp | 2 +- eeschema/eeschema_settings.cpp | 19 ++++++++++--------- eeschema/schematic_settings.cpp | 17 +++++++++-------- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp b/3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp index 23ecb08ae4..a1dd58167a 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2020 Jon Evans - * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -205,11 +205,12 @@ EDA_3D_VIEWER_SETTINGS::EDA_3D_VIEWER_SETTINGS() registerMigration( 0, 1, std::bind( &EDA_3D_VIEWER_SETTINGS::migrateSchema0to1, this ) ); - registerMigration( 1, 2, [&]() -> bool - { - Set( "render.opengl_copper_thickness", false ); - return true; - } ); + registerMigration( 1, 2, + [&]() -> bool + { + Set( "render.opengl_copper_thickness", false ); + return true; + } ); } diff --git a/common/settings/app_settings.cpp b/common/settings/app_settings.cpp index ca4d3edba7..2d8028d777 100644 --- a/common/settings/app_settings.cpp +++ b/common/settings/app_settings.cpp @@ -108,7 +108,6 @@ APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaV m_params.emplace_back( new PARAM( "system.max_undo_items", &m_System.max_undo_items, 0 ) ); - m_params.emplace_back( new PARAM_LIST( "system.file_history", &m_System.file_history, {} ) ); diff --git a/common/settings/color_settings.cpp b/common/settings/color_settings.cpp index 64618f3d38..4735671dcf 100644 --- a/common/settings/color_settings.cpp +++ b/common/settings/color_settings.cpp @@ -232,7 +232,7 @@ COLOR_SETTINGS::COLOR_SETTINGS( const wxString& aFilename, bool aAbsolutePath ) [&]() { // Fix LAYER_VIA_HOLES color - before version 2, this setting had no effect - nlohmann::json::json_pointer ptr( "/board/via_hole"); + nlohmann::json::json_pointer ptr( "/board/via_hole" ); ( *m_internals )[ptr] = COLOR4D( 0.5, 0.4, 0, 0.8 ).ToWxString( wxC2S_CSS_SYNTAX ); diff --git a/eeschema/eeschema_settings.cpp b/eeschema/eeschema_settings.cpp index edff33bef2..77ea5d5e2e 100644 --- a/eeschema/eeschema_settings.cpp +++ b/eeschema/eeschema_settings.cpp @@ -43,16 +43,17 @@ using namespace T_BOMCFG_T; // for the BOM_CFG_PARSER parser and its keyword const int eeschemaSchemaVersion = 1; /// Default value for bom.plugins -const nlohmann::json defaultBomPlugins = { +const nlohmann::json defaultBomPlugins = { - { "name", "bom_csv_grouped_by_value" }, - { "path", "bom_csv_grouped_by_value.py" } - }, - { - { "name", "bom_csv_grouped_by_value_with_fp" }, - { "path", "bom_csv_grouped_by_value_with_fp.py" } - }, - }; + { + { "name", "bom_csv_grouped_by_value" }, + { "path", "bom_csv_grouped_by_value.py" } + }, + { + { "name", "bom_csv_grouped_by_value_with_fp" }, + { "path", "bom_csv_grouped_by_value_with_fp.py" } + }, + }; EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() : diff --git a/eeschema/schematic_settings.cpp b/eeschema/schematic_settings.cpp index c491aa0b38..7c48c6b4dc 100644 --- a/eeschema/schematic_settings.cpp +++ b/eeschema/schematic_settings.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2020 CERN - * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors. * @author Jon Evans * * This program is free software: you can redistribute it and/or modify it @@ -219,15 +219,16 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin m_NgspiceSimulatorSettings = std::make_shared( this, "ngspice" ); - registerMigration( 0, 1, [&]() -> bool - { - OPT tor = Get( "drawing.text_offset_ratio" ); + registerMigration( 0, 1, + [&]() -> bool + { + OPT tor = Get( "drawing.text_offset_ratio" ); - if( tor.is_initialized() ) - Set( "drawing.label_size_ratio", tor.get() ); + if( tor.is_initialized() ) + Set( "drawing.label_size_ratio", tor.get() ); - return true; - } ); + return true; + } ); }