Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Swiftb0y <[email protected]>
  • Loading branch information
JoergAtGithub and Swiftb0y authored Nov 11, 2024
1 parent faa76d0 commit 490ed19
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/engine/controls/macrocontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const QRegExp kAutoGeneratedLabelRegExp(QStringLiteral("[0-9. ]+(\\[\\w*\\])?"))
} // namespace

ConfigKey MacroControl::getConfigKey(const QString& name) {
return ConfigKey(m_group, QStringLiteral("macro_%1_%2").arg(m_slot).arg(name));
return ConfigKey(m_group, QStringLiteral("macro_%1_%2").arg(m_slot, name));

Check failure on line 18 in src/engine/controls/macrocontrol.cpp

View workflow job for this annotation

GitHub Actions / clazy

no matching member function for call to 'arg'

Check failure on line 18 in src/engine/controls/macrocontrol.cpp

View workflow job for this annotation

GitHub Actions / clang-tidy

no matching member function for call to 'arg' [clang-diagnostic-error]

Check failure on line 18 in src/engine/controls/macrocontrol.cpp

View workflow job for this annotation

GitHub Actions / Ubuntu 22.04

no matching function for call to ‘QString::arg(int&, const QString&)’

Check failure on line 18 in src/engine/controls/macrocontrol.cpp

View workflow job for this annotation

GitHub Actions / coverage

no matching function for call to ‘QString::arg(int&, const QString&)’

Check failure on line 18 in src/engine/controls/macrocontrol.cpp

View workflow job for this annotation

GitHub Actions / macOS 12 x64

no matching member function for call to 'arg'

Check failure on line 18 in src/engine/controls/macrocontrol.cpp

View workflow job for this annotation

GitHub Actions / macOS 12 arm64

no matching member function for call to 'arg'

Check failure on line 18 in src/engine/controls/macrocontrol.cpp

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC)

'QString QString::arg(qlonglong,int,int,QChar) const': cannot convert argument 2 from 'const QString' to 'int'

Check failure on line 18 in src/engine/controls/macrocontrol.cpp

View workflow job for this annotation

GitHub Actions / Windows 2019 (MSVC)

'<function-style-cast>': cannot convert from 'const QString' to 'ConfigKey'
}

MacroControl::MacroControl(const QString& group, UserSettingsPointer pConfig, int slot)
Expand Down
2 changes: 1 addition & 1 deletion src/track/macro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void Macro::addAction(const MacroAction& action) {

mixxx::audio::FramePos Macro::getStart() const {
VERIFY_OR_DEBUG_ASSERT(!getActions().isEmpty()) {
return mixxx::audio::FramePos(0);
return mixxx::audio::FramePos();
}
return m_actions.first().getTargetPosition();
}
Expand Down
2 changes: 1 addition & 1 deletion src/track/macroaction.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace proto = mixxx::track::io;
/// but that is subject to change.
class MacroAction {
public:
enum class Type : uint32_t {
enum class Type {
Jump = 0
};

Expand Down

0 comments on commit 490ed19

Please sign in to comment.