Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Aug 23, 2024
1 parent 2556d80 commit 2e4702f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ find_package(Qt${QT_VERSION_MAJOR} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core G

set(CMAKE_AUTOMOC ON)

if (MSVC)
if(MSVC)
add_compile_options(/Zc:__cplusplus)
endif()

Expand Down
2 changes: 1 addition & 1 deletion qt/qt6_natvis/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <QtCore>

#include <unordered_set>
#include <unordered_map>
#include <unordered_set>

int main(int argc, char *argv[])
{
Expand Down
2 changes: 1 addition & 1 deletion qt/qt_fmt/qt_fmt.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include "qt_fmt_helpers.h"

#include <fmt/format.h>
#include <QDebug>
#include <fmt/format.h>

template<typename T>
struct fmt::formatter<T, char,
Expand Down
13 changes: 6 additions & 7 deletions qt/qt_fmt/qt_fmt_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@

#include <type_traits>

#include <QByteArray>
#include <QDebug>
#include <QString>
#include <QByteArray>
#include <utility>
#include <vector>
#include <list>
#include <map>
#include <set>
#include <list>
#include <unordered_map>
#include <unordered_set>
#include <string>
#include <string_view>
#include <unordered_map>
#include <unordered_set>
#include <utility>
#include <vector>

namespace Qt_fmt
{
Expand Down Expand Up @@ -88,4 +88,3 @@ struct exclude_from_qdebug_fmt
// clang-format on

} // namespace Qt_fmt

7 changes: 3 additions & 4 deletions qt/qt_fmt/qt_std_format.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@
#error "This header requires C++20"
#endif

#include <format>
#include <QDebug>
#include "qt_fmt_helpers.h"
#include <QDebug>
#include <format>

namespace Qt_fmt::detail
{
template<typename T>
concept IsFormattableViaQDebug = requires(QDebug &d, const T &t)
{
concept IsFormattableViaQDebug = requires(QDebug &d, const T &t) {
d << t;
requires !Qt_fmt::exclude_from_qdebug_fmt<T>::value;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void tst_QStringTokenizer::basics() const
QFETCH(const Qt::CaseSensitivity, cs);

auto expected = QStringList{
QLatin1String(""), QStringLiteral("a"), QStringLiteral("b"), QStringLiteral("c"),
QLatin1String(""), QStringLiteral("a"), QStringLiteral("b"), QStringLiteral("c"),
QStringLiteral("d"), QStringLiteral("e"), QLatin1String(""),
};
if (sb & Qt::SkipEmptyParts)
Expand Down

0 comments on commit 2e4702f

Please sign in to comment.