Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-merge-conflict
- id: check-case-conflict
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v20.1.7
rev: v22.1.2
hooks:
- id: clang-format
'types_or': [c++, c]
Expand Down
12 changes: 6 additions & 6 deletions include/uibase/questionboxmemory.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ class QDLLEXPORT QuestionBoxMemory : public QDialog
static Button
query(QWidget* parent, const QString& windowName, const QString& title,
const QString& text,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Yes |
QDialogButtonBox::No,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Yes |
QDialogButtonBox::No,
QDialogButtonBox::StandardButton defaultButton = QDialogButtonBox::NoButton);

static Button
query(QWidget* parent, const QString& windowName, const QString& fileName,
const QString& title, const QString& text,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Yes |
QDialogButtonBox::No,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Yes |
QDialogButtonBox::No,
QDialogButtonBox::StandardButton defaultButton = QDialogButtonBox::NoButton);

static void setWindowMemory(const QString& windowName, Button b);
Expand All @@ -99,8 +99,8 @@ private slots:
static Button queryImpl(
QWidget* parent, const QString& windowName, const QString* fileName,
const QString& title, const QString& text,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Yes |
QDialogButtonBox::No,
QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Yes |
QDialogButtonBox::No,
QDialogButtonBox::StandardButton defaultButton = QDialogButtonBox::NoButton);

std::unique_ptr<Ui::QuestionBoxMemory> ui;
Expand Down
4 changes: 2 additions & 2 deletions src/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#pragma warning(disable : 4946) // reinterpret_cast used between related classes
#pragma warning(disable : 4800) // implicit conversion
#pragma warning(disable : 5219) // implicit int -> float conversion
#pragma warning( \
disable : 5249) // named enumerators with values outside of bit field width
#pragma warning(disable \
: 5249) // named enumerators with values outside of bit field width

#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING 1

Expand Down
12 changes: 6 additions & 6 deletions src/versioninfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,12 @@ QDLLEXPORT bool operator<(const VersionInfo& LHS, const VersionInfo& RHS)
// versions as regular if in doubt so if the scheme is "decimal" it is definitively
// a decimal version number whereas SCHEME_REGULAR means "probably regular"

float leftVal = QString("%1.%2")
.arg(LHS.m_Major)
.arg(QString("%1")
.arg(LHS.m_Minor)
.rightJustified(LHS.m_DecimalPositions, '0'))
.toFloat();
float leftVal = QString("%1.%2")
.arg(LHS.m_Major)
.arg(QString("%1")
.arg(LHS.m_Minor)
.rightJustified(LHS.m_DecimalPositions, '0'))
.toFloat();
float rightVal = QString("%1.%2")
.arg(RHS.m_Major)
.arg(QString("%1")
Expand Down
Loading