Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch to clang-format 19 in gh action #3982

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

switch to clang-format 19 in gh action #3982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/clang-format-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++ programs.
uses: jidicula/clang-format-action@v4.11.0
uses: jidicula/clang-format-action@v4.14.0
with:
clang-format-version: "18"
clang-format-version: "19"
check-path: ${{ matrix.path['check'] }}
exclude-regex: ${{ matrix.path['exclude'] }}
2 changes: 1 addition & 1 deletion bindings/qt/lib/src/textquickitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <QPainter>

//#define DRAW_DEBUG_BOUNDING_BOXES
// #define DRAW_DEBUG_BOUNDING_BOXES

namespace vrvQt {

Expand Down
4 changes: 2 additions & 2 deletions src/iohumdrum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2939,7 +2939,7 @@ void HumdrumInput::createDigitalSource(pugi::xml_node sourceDesc)
pugi::xml_node bibl = source.append_child("bibl");
bibl.append_copy(m_simpleTitle);
for (pugi::xml_node_iterator childIt = m_simpleComposersDoc.begin(); childIt != m_simpleComposersDoc.end();
++childIt) {
++childIt) {
bibl.append_copy(*childIt);
}

Expand Down Expand Up @@ -3691,7 +3691,7 @@ void HumdrumInput::createPrintedSource(pugi::xml_node sourceDesc)

bibl.append_copy(m_simpleTitle);
for (pugi::xml_node_iterator childIt = m_simpleComposersDoc.begin(); childIt != m_simpleComposersDoc.end();
++childIt) {
++childIt) {
bibl.append_copy(*childIt);
}

Expand Down
10 changes: 5 additions & 5 deletions src/iomusxml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3492,7 +3492,7 @@ void MusicXmlInput::ReadMusicXmlNote(
m_trillStack.push_back({ trill, openTrill });
}
for (pugi::xml_node xmlAccidMark = xmlTrill.node().next_sibling("accidental-mark"); xmlAccidMark;
xmlAccidMark = xmlAccidMark.next_sibling("accidental-mark")) {
xmlAccidMark = xmlAccidMark.next_sibling("accidental-mark")) {
if (HasAttributeWithValue(xmlAccidMark, "placement", "below")) {
trill->SetAccidlower(ConvertAccidentalToAccid(xmlAccidMark.text().as_string()));
}
Expand Down Expand Up @@ -3530,7 +3530,7 @@ void MusicXmlInput::ReadMusicXmlNote(
turn->SetPlace(turn->AttPlacementRelStaff::StrToStaffrel(xmlTurn.node().attribute("placement").as_string()));
turn->SetForm(turnLog_FORM_upper);
for (pugi::xml_node xmlAccidMark = xmlTurn.node().next_sibling("accidental-mark"); xmlAccidMark;
xmlAccidMark = xmlAccidMark.next_sibling("accidental-mark")) {
xmlAccidMark = xmlAccidMark.next_sibling("accidental-mark")) {
if (HasAttributeWithValue(xmlAccidMark, "placement", "above")) {
turn->SetAccidupper(ConvertAccidentalToAccid(xmlAccidMark.text().as_string()));
}
Expand Down Expand Up @@ -4691,7 +4691,7 @@ std::pair<std::vector<int>, int> MusicXmlInput::GetMeterSigGrpValues(const pugi:
int maxUnit = 0;
std::vector<int> meterCounts;
for (auto iter1 = beats.begin(), iter2 = beat_type.begin(); (iter1 != beats.end()) && (iter2 != beat_type.end());
++iter1, ++iter2) {
++iter1, ++iter2) {
// Process current beat/beat-type combination and add it to the meterSigGrp
MeterSig *meterSig = new MeterSig();
data_METERCOUNT_pair count = meterSig->AttMeterSigLog::StrToMetercountPair(iter1->node().text().as_string());
Expand Down Expand Up @@ -4739,8 +4739,8 @@ std::string MusicXmlInput::GetOrnamentGlyphNumber(int attributes) const
static std::map<int, std::string> precomposedNames = {
{ APPR_Above | FORM_Inverted, "U+E5C6" }, { APPR_Below | FORM_Inverted, "U+E5B5" },
{ APPR_Above | FORM_Normal, "U+E5C7" }, { APPR_Below | FORM_Normal, "U+E5B8" },
{ FORM_Inverted | DEP_Above, "U+E5BB" }, { FORM_Inverted | DEP_Below, "U+E5C8" }
// these values need to be matched with proper SMuFL codes first
{ FORM_Inverted | DEP_Above, "U+E5BB" },
{ FORM_Inverted | DEP_Below, "U+E5C8" } // these values need to be matched with proper SMuFL codes first
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are code changes supposed to be in this PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably the formatting with the new version

/*, { FORM_Normal | DEP_Above, "U+????" },
{ FORM_Normal | DEP_Below, "U+????" }, { APPR_Above | FORM_Normal | DEP_Above, "U+????" },
{ APPR_Above | FORM_Normal | DEP_Above, "U+????" }, { APPR_Above | FORM_Normal | DEP_Below, "U+????" },
Expand Down