summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikaƫl Capelle <capelle.mikael@gmail.com>2024-05-26 12:20:02 +0200
committerGitHub <noreply@github.com>2024-05-26 12:20:02 +0200
commita11617ff65f8570e7c33db420c207ef304529322 (patch)
tree87d56ca7e7d15325640bd3193943b225414dc322
parent1871f32a8db7e707a6d96a41f09147d8558e0003 (diff)
Use MO2 formatting action. (#2032)
-rw-r--r--.github/workflows/linting.yml6
-rw-r--r--src/datatab.cpp14
-rw-r--r--src/glob_matching.h2
-rw-r--r--src/modlistview.cpp4
-rw-r--r--src/savestab.cpp5
5 files changed, 15 insertions, 16 deletions
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 43cdeeae..40b3f7fe 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- - name: Run clang-format
- uses: jidicula/clang-format-action@v4.11.0
+ - name: Check format
+ uses: ModOrganizer2/check-formatting-action@master
with:
- clang-format-version: "15"
check-path: "."
+ exclude-regex: "third-party"
diff --git a/src/datatab.cpp b/src/datatab.cpp
index 567fa99d..e531c1e0 100644
--- a/src/datatab.cpp
+++ b/src/datatab.cpp
@@ -16,13 +16,13 @@ QString UnmanagedModName();
DataTab::DataTab(OrganizerCore& core, PluginContainer& pc, QWidget* parent,
Ui::MainWindow* mwui)
- : m_core(core), m_pluginContainer(pc),
- m_parent(parent), ui{mwui->tabWidget,
- mwui->dataTab,
- mwui->dataTabRefresh,
- mwui->dataTree,
- mwui->dataTabShowOnlyConflicts,
- mwui->dataTabShowFromArchives},
+ : m_core(core), m_pluginContainer(pc), m_parent(parent),
+ ui{mwui->tabWidget,
+ mwui->dataTab,
+ mwui->dataTabRefresh,
+ mwui->dataTree,
+ mwui->dataTabShowOnlyConflicts,
+ mwui->dataTabShowFromArchives},
m_needUpdate(true)
{
m_filetree.reset(new FileTree(core, m_pluginContainer, ui.tree));
diff --git a/src/glob_matching.h b/src/glob_matching.h
index b47d30ac..c0620aaf 100644
--- a/src/glob_matching.h
+++ b/src/glob_matching.h
@@ -178,7 +178,7 @@ GlobPattern(std::basic_string<CharT, Traits, Allocator> const&)
template <class CharT>
GlobPattern(CharT const*) -> GlobPattern<CharT>;
-GlobPattern(QString const&)->GlobPattern<QChar>;
+GlobPattern(QString const&) -> GlobPattern<QChar>;
} // namespace MOShared
diff --git a/src/modlistview.cpp b/src/modlistview.cpp
index 944825fa..81e87c5e 100644
--- a/src/modlistview.cpp
+++ b/src/modlistview.cpp
@@ -137,8 +137,8 @@ public:
ModListView::ModListView(QWidget* parent)
: QTreeView(parent), m_core(nullptr), m_sortProxy(nullptr),
- m_byPriorityProxy(nullptr), m_byCategoryProxy(nullptr),
- m_byNexusIdProxy(nullptr), m_markers{{}, {}, {}, {}, {}, {}},
+ m_byPriorityProxy(nullptr), m_byCategoryProxy(nullptr), m_byNexusIdProxy(nullptr),
+ m_markers{{}, {}, {}, {}, {}, {}},
m_scrollbar(new ModListViewMarkingScrollBar(this))
{
setVerticalScrollBar(m_scrollbar);
diff --git a/src/savestab.cpp b/src/savestab.cpp
index c6ab645f..813fea05 100644
--- a/src/savestab.cpp
+++ b/src/savestab.cpp
@@ -8,9 +8,8 @@
using namespace MOBase;
SavesTab::SavesTab(QWidget* window, OrganizerCore& core, Ui::MainWindow* mwui)
- : m_window(window), m_core(core),
- m_CurrentSaveView(nullptr), ui{mwui->tabWidget, mwui->savesTab,
- mwui->savegameList}
+ : m_window(window), m_core(core), m_CurrentSaveView(nullptr),
+ ui{mwui->tabWidget, mwui->savesTab, mwui->savegameList}
{
m_SavesWatcherTimer.setSingleShot(true);
m_SavesWatcherTimer.setInterval(500);