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.

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

Use MO2 formatting action. #2032

Merged
merged 1 commit into from
May 26, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 7 additions & 7 deletions src/datatab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/glob_matching.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/modlistview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ class ModListViewMarkingScrollBar : public ViewMarkingScrollBar

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);
Expand Down
5 changes: 2 additions & 3 deletions src/savestab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading