|
KiCad PCB EDA Suite
|
#include <lib_merge_applier.h>
Public Attributes | |
| std::size_t | itemsTakenOurs = 0 |
| std::size_t | itemsTakenTheirs = 0 |
| std::size_t | itemsTakenAncestor = 0 |
| std::size_t | itemsDeleted = 0 |
| std::size_t | itemsKept = 0 |
| std::size_t | itemsCombined = 0 |
| std::size_t | mergePropsFallback = 0 |
| std::vector< KIID_PATH > | mergePropsFallbackIds |
| Item IDs (KIID_PATH from LibraryItemKiidPath) for resolutions that the applier silently downgraded (currently: MERGE_PROPS -> TAKE_ OURS). | |
Definition at line 77 of file lib_merge_applier.h.
| std::size_t KICAD_DIFF::LIB_MERGE_APPLIER< ITEM >::REPORT::itemsCombined = 0 |
Definition at line 84 of file lib_merge_applier.h.
| std::size_t KICAD_DIFF::LIB_MERGE_APPLIER< ITEM >::REPORT::itemsDeleted = 0 |
Definition at line 82 of file lib_merge_applier.h.
Referenced by BOOST_AUTO_TEST_CASE(), and BOOST_AUTO_TEST_CASE().
| std::size_t KICAD_DIFF::LIB_MERGE_APPLIER< ITEM >::REPORT::itemsKept = 0 |
Definition at line 83 of file lib_merge_applier.h.
Referenced by BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), and BOOST_AUTO_TEST_CASE().
| std::size_t KICAD_DIFF::LIB_MERGE_APPLIER< ITEM >::REPORT::itemsTakenAncestor = 0 |
Definition at line 81 of file lib_merge_applier.h.
Referenced by BOOST_AUTO_TEST_CASE().
| std::size_t KICAD_DIFF::LIB_MERGE_APPLIER< ITEM >::REPORT::itemsTakenOurs = 0 |
Definition at line 79 of file lib_merge_applier.h.
Referenced by BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), and BOOST_AUTO_TEST_CASE().
| std::size_t KICAD_DIFF::LIB_MERGE_APPLIER< ITEM >::REPORT::itemsTakenTheirs = 0 |
Definition at line 80 of file lib_merge_applier.h.
Referenced by BOOST_AUTO_TEST_CASE().
| std::size_t KICAD_DIFF::LIB_MERGE_APPLIER< ITEM >::REPORT::mergePropsFallback = 0 |
Definition at line 85 of file lib_merge_applier.h.
Referenced by BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), and BOOST_AUTO_TEST_CASE().
| std::vector<KIID_PATH> KICAD_DIFF::LIB_MERGE_APPLIER< ITEM >::REPORT::mergePropsFallbackIds |
Item IDs (KIID_PATH from LibraryItemKiidPath) for resolutions that the applier silently downgraded (currently: MERGE_PROPS -> TAKE_ OURS).
The job handler folds these into the unresolved set so the reported conflict count reflects each affected item.
Definition at line 91 of file lib_merge_applier.h.
Referenced by BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), BOOST_AUTO_TEST_CASE(), and BOOST_AUTO_TEST_CASE().