Skip to content

Commit 01bc239

Browse files
korlikorli
authored
Clang format on push (#22)
1 parent f48f21b commit 01bc239

File tree

4 files changed

+113
-57
lines changed

4 files changed

+113
-57
lines changed

‎.clang-format‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Language: Cpp # single option
2+
BasedOnStyle: Chromium
3+
AccessModifierOffset: -4
4+
AlignAfterOpenBracket: DontAlign
5+
AlwaysBreakAfterReturnType: TopLevelDefinitions
6+
BinPackParameters: true
7+
ColumnLimit: 100
8+
LineEnding: LF
9+
TabWidth: 4
10+
IndentWidth: 4
11+
UseTab: Always
12+
BraceWrapping:
13+
AfterCaseLabel: true
14+
AfterEnum: false
15+
AfterFunction: true
16+
SplitEmptyFunction: true
17+
BreakBeforeBraces: Custom
18+
AllowShortEnumsOnASingleLine: false
19+
SeparateDefinitionBlocks: Leave
20+
MaxEmptyLinesToKeep: 2
21+
PackConstructorInitializers: Never
22+
BreakBeforeBinaryOperators: All

‎.github/workflows/codeformat.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Format (clang-format)
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
8+
jobs:
9+
clang-format:
10+
runs-on: ubuntu-24.04
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
ref: ${{ github.head_ref }}
15+
16+
- name: Set up clang-format
17+
run: |
18+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
19+
sudo add-apt-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
20+
sudo apt install clang-format-19
21+
22+
- name: Run clang-format
23+
run: |
24+
which clang-format-19
25+
clang-format-19 -i Src/Source/*.cpp Src/Headers/*.h
26+
27+
- uses: stefanzweifel/git-auto-commit-action@v5
28+
with:
29+
commit_message: Apply clang-format changes

‎Src/Headers/Constants.h‎

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ inline bool operator!=(rgb_color &a, rgb_color &b)
3232
#define GREEK_SYMBOL_FONT_FAMILY "rtxmi"
3333
#define GREEK_SYMBOL_FONT_STYLE "Medium"
3434

35+
// clang-format off
3536
//lower case letters
3637
namespace GreekSymbolConstants
3738
{
@@ -47,10 +48,10 @@ namespace GreekSymbolConstants
4748
K_GREEK_SYMBOL_IOTA = 19,
4849
K_GREEK_SYMBOL_KAPPA = 20,
4950
K_GREEK_SYMBOL_LAMBDA = 21,
50-
K_GREEK_SYMBOL_MU = 22,
51-
K_GREEK_SYMBOL_NU = 23,
52-
K_GREEK_SYMBOL_XI = 24,
53-
K_GREEK_SYMBOL_PI = 25,
51+
K_GREEK_SYMBOL_MU = 22,
52+
K_GREEK_SYMBOL_NU = 23,
53+
K_GREEK_SYMBOL_XI = 24,
54+
K_GREEK_SYMBOL_PI = 25,
5455
K_GREEK_SYMBOL_RHO = 26,
5556
K_GREEK_SYMBOL_SIGMA = 27,
5657
K_GREEK_SYMBOL_TAU = 28,
@@ -66,20 +67,20 @@ namespace GreekSymbolConstants
6667
namespace ColorConstants
6768
{
6869
const rgb_color
69-
K_BLACK = {0,0,0,255},
70-
K_WHITE = {255,255,255,255},
71-
K_RED = {255,0,0,255},
72-
K_BLUE = {0,0,255,255},
70+
K_BLACK = {0,0,0,255},
71+
K_WHITE = {255,255,255,255},
72+
K_RED = {255,0,0,255},
73+
K_BLUE = {0,0,255,255},
7374
K_MAGENTA = {255,0,255,255},
74-
K_YELLOW = {254,202,0,255},
75-
K_GREEN = {0,150,113,255},
76-
K_PURPLE = {136,0,156,255},
75+
K_YELLOW = {254,202,0,255},
76+
K_GREEN = {0,150,113,255},
77+
K_PURPLE = {136,0,156,255},
7778
K_NAVY_BLUE = {50,0,150,255},
78-
K_ORANGE = {255,174,0,255},
79+
K_ORANGE = {255,174,0,255},
7980
K_BUBBLE_DEFAULT = {255,255,200,255},
8081
/*BeOS Colors*/
81-
K_BE_BLUE_BACKGROUND = {51,102,152,255},
82-
K_BE_BLUE_STATUS_BAR = {51,152,255,255},
82+
K_BE_BLUE_BACKGROUND = {51,102,152,255},
83+
K_BE_BLUE_STATUS_BAR = {51,152,255,255},
8384
K_BE_BLUE_FOCUS = {0,0,229,255},
8485
K_BE_YELLOW_TAB = {255,203,0,255},
8586
K_BE_GREY_PANEL = {216,216,216,255},
@@ -98,42 +99,42 @@ namespace ColorConstants
9899
K_SPECTRUM_INDIGO = {25,0,60,255},
99100
K_SPECTRUM_PURPLE = {105,0,84,255},
100101
//Metal
101-
K_GOLD = {234,209,0,255},
102-
K_SILVER = {226,226,226,255},
103-
K_COPPER = {213,100,0,255},
102+
K_GOLD = {234,209,0,255},
103+
K_SILVER = {226,226,226,255},
104+
K_COPPER = {213,100,0,255},
104105
K_ORICHALCHUM = {255,174,0},
105106

106107
//UI color constants
107-
K_UNSAVED_TEXT_COLOR = {0,0,255}
108+
K_UNSAVED_TEXT_COLOR = {0,0,255}
108109
;
109110
};
110111

111112
namespace MenuConstants
112113
{
113114
//File Menu
114115
const uint32
115-
K_MENU_FILE_NEW = 'mfnw',
116-
K_MENU_FILE_OPEN = 'mfop',
116+
K_MENU_FILE_NEW = 'mfnw',
117+
K_MENU_FILE_OPEN = 'mfop',
117118
K_MENU_FILE_OPEN_RECENT = 'mfor',
118119
K_MENU_FILE_OPEN_TEMPLATE = 'mfot',
119120
K_MENU_FILE_OPEN_FOLDER = 'mfof',
120121
K_UPDATE_RECENT_DOCS = 'udrd',
121-
K_MENU_FILE_CLOSE = 'mfcl',
122-
K_MENU_FILE_SAVE = 'mfsv',
122+
K_MENU_FILE_CLOSE = 'mfcl',
123+
K_MENU_FILE_SAVE = 'mfsv',
123124
K_MENU_FILE_SAVEAS = 'mfsa',
124125
K_MENU_FILE_NEXT_ITEM = 'mfni',
125126
K_MENU_FILE_PREV_ITEM = 'mfpi',
126127
K_MENU_FILE_PAGE_SETUP = 'mfps',
127-
K_MENU_FILE_PRINT = 'mfpr',
128-
K_MENU_FILE_PREFS = 'mfpf',
129-
K_MENU_FILE_ABOUT = 'mfab',
130-
K_MENU_FILE_QUIT = 'mfqt'
128+
K_MENU_FILE_PRINT = 'mfpr',
129+
K_MENU_FILE_PREFS = 'mfpf',
130+
K_MENU_FILE_ABOUT = 'mfab',
131+
K_MENU_FILE_QUIT = 'mfqt'
131132
;
132133

133134
//Edit Menu
134135
const uint32
135-
K_MENU_EDIT_UNDO = 'meun',
136-
K_MENU_EDIT_REDO = 'mere',
136+
K_MENU_EDIT_UNDO = 'meun',
137+
K_MENU_EDIT_REDO = 'mere',
137138
K_MENU_EDIT_SEARCH = 'mesh',
138139
K_MENU_EDIT_GOTOLINE = 'megl'
139140
;
@@ -146,23 +147,23 @@ namespace MenuConstants
146147
K_MENU_FORMAT_SHIFT_LEFT = 'ftsl',
147148
K_MENU_FORMAT_SHIFT_RIGHT = 'ftsr',
148149
K_MENU_FORMAT_COMMENTLINE = 'ftcl',
149-
K_MENU_FORMAT_UNCOMMENTLINE = 'ftul',
150-
K_MENU_FORMAT_RESET_LAYOUT = 'rlmf'
150+
K_MENU_FORMAT_UNCOMMENTLINE = 'ftul',
151+
K_MENU_FORMAT_RESET_LAYOUT = 'rlmf'
151152
;
152153

153154
//Insert Menu
154155
const uint32
155156
K_MENU_INSERT_FILE = 'mife',
156-
K_MENU_INSERT_FILE_RECEIVED = 'frim',
157+
K_MENU_INSERT_FILE_RECEIVED = 'frim',
157158
K_MENU_INSERT_DATE = 'mide',
158159
K_MENU_INSERT_ARRAY = 'miay',
159-
K_MENU_INSERT_ARRAY_WITHDIM = 'aywd',
160+
K_MENU_INSERT_ARRAY_WITHDIM = 'aywd',
160161
K_MENU_INSERT_MATRIX = 'mimx',
161-
K_MENU_INSERT_MATRIX_WITHDIM = 'mxwd',
162+
K_MENU_INSERT_MATRIX_WITHDIM = 'mxwd',
162163
K_MENU_INSERT_TABULAR = 'mitr',
163-
K_MENU_INSERT_TABULAR_WITHDIM = 'trwd',
164+
K_MENU_INSERT_TABULAR_WITHDIM = 'trwd',
164165
K_MENU_INSERT_EQUATION = 'mien',
165-
K_MENU_INSERT_COLORED_TEXT = 'mict',
166+
K_MENU_INSERT_COLORED_TEXT = 'mict',
166167
K_MENU_INSERT_ITEMIZE = 'miit',
167168
K_MENU_INSERT_DESCRIPTION = 'midn',
168169
K_MENU_INSERT_ENUMERATE = 'miee',
@@ -172,7 +173,7 @@ namespace MenuConstants
172173
K_MENU_INSERT_FIGURE = 'mifg',
173174
K_MENU_INSERT_TABLE = 'mitb',
174175
K_MENU_INSERT_EQNARRAY = 'miea',
175-
K_MENU_INSERT_EQNARRAY_STAR = 'mies',
176+
K_MENU_INSERT_EQNARRAY_STAR = 'mies',
176177
K_MENU_INSERT_VERBATIM = 'mivb',
177178
K_MENU_INSERT_QUOTE = 'miqt'
178179
;
@@ -196,13 +197,13 @@ namespace ToolbarConstants
196197
K_CMD_LAUNCH_PSVIEWER = 'lpsv',
197198
K_CMD_LAUNCH_BE_PDF = 'lbpf',
198199
K_CMD_LAUNCH_HTMLVIEWER = 'lhlv',
199-
K_UPDATE_TEXTVIEW_SHORTCUTS = 'udts'
200+
K_UPDATE_TEXTVIEW_SHORTCUTS = 'udts'
200201
;
201202
};
202203

203204
namespace AboutMessages
204205
{
205-
const uint32 K_ABOUT_WINDOW_QUIT = 'abwq',
206+
const uint32 K_ABOUT_WINDOW_QUIT = 'abwq',
206207
K_ABOUT_WINDOW_LAUNCH = 'abwg',
207208
K_GOTO_BETEX_HOMEPAGE = 'gtbh',
208209
K_GOTO_BETEX_DONATEPAGE = 'gtbd',
@@ -215,8 +216,8 @@ namespace SearchWindowConstants
215216
const uint32
216217
K_SEARCH_WINDOW_FIND = 'swfd',
217218
K_SEARCH_WINDOW_REPLACE = 'swrp',
218-
K_SEARCH_WINDOW_REPLACE_ALL = 'swra',
219-
K_SEARCH_WINDOW_SETTINGS_CHANGED = 'swsc',
219+
K_SEARCH_WINDOW_REPLACE_ALL = 'swra',
220+
K_SEARCH_WINDOW_SETTINGS_CHANGED = 'swsc',
220221
K_SEARCH_WINDOW_QUIT = 'swqt'
221222
;
222223
};
@@ -226,22 +227,22 @@ namespace ColorPrefsConstants
226227
const uint32
227228
K_COLOR_WINDOW_QUIT = 'clrq',
228229
K_COLOR_PREFS_UPDATE = 'cput',
229-
K_COLOR_PREFS_OK = 'cpok',
230+
K_COLOR_PREFS_OK = 'cpok',
230231
K_COLOR_PREFS_CANCEL = 'cpcl'
231232
;
232233
};
233234

234235
namespace PrefsConstants
235236
{
236237
const uint32
237-
K_PREFS_UPDATE = 'PVud',
238-
K_PREFS_VIEW_OK = 'pvok',
238+
K_PREFS_UPDATE = 'PVud',
239+
K_PREFS_VIEW_OK = 'pvok',
239240
K_PREFS_VIEW_CANCEL = 'pvcl',
240-
K_PREFS_VIEW_RESET_COLOR_DEFAULTS = 'pcrd',
241-
K_PREFS_VIEW_RESET_COMMAND_DEFAULTS = 'pcmd',
242-
K_PREFS_VIEW_RESET_TOOLBAR_DEFAULTS = 'pvrt',
243-
K_PREFS_VIEW_RESET_GENERAL_DEFAULTS = 'pcgd',
244-
K_PREFS_WINDOW_QUIT = 'pfwq'
241+
K_PREFS_VIEW_RESET_COLOR_DEFAULTS = 'pcrd',
242+
K_PREFS_VIEW_RESET_COMMAND_DEFAULTS = 'pcmd',
243+
K_PREFS_VIEW_RESET_TOOLBAR_DEFAULTS = 'pvrt',
244+
K_PREFS_VIEW_RESET_GENERAL_DEFAULTS = 'pcgd',
245+
K_PREFS_WINDOW_QUIT = 'pfwq'
245246
;
246247

247248
const uint32
@@ -257,22 +258,24 @@ namespace InterfaceConstants
257258
const uint32
258259
K_CMD_TBUTTON_INSERT = 'ctbi',
259260
K_HANDLE_HIERARCHY = 'hier',
260-
K_ANALYSE_TEXVIEW = 'atxv',
261-
K_PARSE_LINE = 'psln',
262-
K_UPDATE_CLIPBOARD_MENU_STATUS = 'ucms',
261+
K_ANALYSE_TEXVIEW = 'atxv',
262+
K_PARSE_LINE = 'psln',
263+
K_UPDATE_CLIPBOARD_MENU_STATUS = 'ucms',
263264
K_UPDATE_STATUSBAR = 'udsb',
264265
K_UNDO_HIGHLIGHTING = 'udhl',
265266
K_FILE_CONTENTS_CHANGED = 'fcch',
266-
K_GTL_WINDOW_GO = 'glwg',
267-
K_GTL_WINDOW_QUIT = 'glwq',
268-
K_RESET_ALL_TEX_VIEW_COLORS = 'ratc',
269-
K_RESET_ALL_TEX_VIEW_FONTS = 'ratf',
267+
K_GTL_WINDOW_GO = 'glwg',
268+
K_GTL_WINDOW_QUIT = 'glwq',
269+
K_RESET_ALL_TEX_VIEW_COLORS = 'ratc',
270+
K_RESET_ALL_TEX_VIEW_FONTS = 'ratf',
270271
K_SPAN_WINDOW_LAUNCH = 'spwl',
271272
K_SPAN_WINDOW_QUIT = 'spwq',
272-
K_DIM_WINDOW_OK = 'dwok',
273+
K_DIM_WINDOW_OK = 'dwok',
273274
K_DIM_WINDOW_CANCEL = 'dwcl',
274-
K_DIM_WINDOW_QUIT = 'dwqt'
275+
K_DIM_WINDOW_QUIT = 'dwqt'
275276
;
276277
};
278+
279+
// clang-format on
277280

278281
#endif

‎Src/Source/ToolbarButton.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ WToolbarButton::GetBitmapSetAt(unsigned index)
488488

489489
BBitmap * WToolbarButton::GetMenuCheckMark(void)
490490
{
491+
// clang-format off
491492
static const unsigned char kCheckMarkBitmapData[] = {
492493
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
493494
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0C, 0x0C, 0xFF, 0xFF,
@@ -502,6 +503,7 @@ BBitmap * WToolbarButton::GetMenuCheckMark(void)
502503
0xFF, 0xFF, 0xFF, 0x0C, 0x0C, 0x0C, 0x17, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
503504
0xFF, 0xFF, 0xFF, 0xFF, 0x0C, 0x17, 0x17, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
504505
};
506+
// clang-format on
505507
BBitmap *ret = new BBitmap(BRect(0.0, 0.0, 11.0, 11.0), B_CMAP8);
506508
memcpy(ret->Bits(), kCheckMarkBitmapData, 144);
507509
return ret;

0 commit comments

Comments
 (0)