]> git.pld-linux.org Git - packages/codeblocks.git/blame - codeblocks-astyle-3.1.patch
projects / packages / codeblocks.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated to 17.12
[packages/codeblocks.git] / codeblocks-astyle-3.1.patch
CommitLineData
0bf0e321
JB		 1diff --git a/src/plugins/astyle/asstreamiterator.cpp b/src/plugins/astyle/asstreamiterator.cpp
2index a2d75f2c9..cc6244109 100644
3--- a/src/plugins/astyle/asstreamiterator.cpp
4+++ b/src/plugins/astyle/asstreamiterator.cpp
5@@ -53,8 +53,10 @@ std::string ASStreamIterator::nextLine(cb_unused bool emptyLineWasDeleted)
6
7 std::string ASStreamIterator::peekNextLine()
8 {
9- if (!m_SavedCharPtr)
10+ if (!m_SavedCharPtr){
11 m_SavedCharPtr = m_CharPtr;
12+ m_SavedCurChar = m_CurChar;
13+ }
14
15 return readLine();
16 }
17@@ -62,6 +64,7 @@ std::string ASStreamIterator::peekNextLine()
18 void ASStreamIterator::peekReset()
19 {
20 m_CharPtr = m_SavedCharPtr;
21+ m_CurChar = m_SavedCurChar;
22 m_SavedCharPtr = 0;
23 }
24
25diff --git a/src/plugins/astyle/asstreamiterator.h b/src/plugins/astyle/asstreamiterator.h
26index 105ca9956..d1a6c8fcd 100644
27--- a/src/plugins/astyle/asstreamiterator.h
28+++ b/src/plugins/astyle/asstreamiterator.h
29@@ -22,6 +22,7 @@ class ASStreamIterator : public astyle::ASSourceIterator
30
31 bool hasMoreLines() const;
32 int getStreamLength() const;
33+ std::streamoff getPeekStart() const { return 0; }
34 std::string nextLine(bool emptyLineWasDeleted = false);
35 std::string peekNextLine();
36 void peekReset();
37@@ -39,6 +40,7 @@ class ASStreamIterator : public astyle::ASSourceIterator
38 const wxChar* m_CharPtr;
39 const wxChar* m_SavedCharPtr;
40 int m_CurChar;
41+ int m_SavedCurChar;
42 int m_CurLine;
43 bool m_FoundBookmark;
44 bool m_FoundBreakpoint;
45diff --git a/src/plugins/astyle/astyleconfigdlg.cpp b/src/plugins/astyle/astyleconfigdlg.cpp
46index a6372b6fe..7464b74f8 100644
47--- a/src/plugins/astyle/astyleconfigdlg.cpp
48+++ b/src/plugins/astyle/astyleconfigdlg.cpp
49@@ -34,12 +34,13 @@ BEGIN_EVENT_TABLE(AstyleConfigDlg, wxPanel)
50 EVT_RADIOBUTTON(XRCID("rbStroustrup"), AstyleConfigDlg::OnStyleChange)
51 EVT_RADIOBUTTON(XRCID("rbWhitesmith"), AstyleConfigDlg::OnStyleChange)
52 EVT_RADIOBUTTON(XRCID("rbVTK"), AstyleConfigDlg::OnStyleChange)
53- EVT_RADIOBUTTON(XRCID("rbBanner"), AstyleConfigDlg::OnStyleChange)
54+ EVT_RADIOBUTTON(XRCID("rbRatliff"), AstyleConfigDlg::OnStyleChange)
55 EVT_RADIOBUTTON(XRCID("rbGNU"), AstyleConfigDlg::OnStyleChange)
56 EVT_RADIOBUTTON(XRCID("rbLinux"), AstyleConfigDlg::OnStyleChange)
57 EVT_RADIOBUTTON(XRCID("rbHorstmann"), AstyleConfigDlg::OnStyleChange)
58 EVT_RADIOBUTTON(XRCID("rb1TBS"), AstyleConfigDlg::OnStyleChange)
59 EVT_RADIOBUTTON(XRCID("rbGoogle"), AstyleConfigDlg::OnStyleChange)
60+ EVT_RADIOBUTTON(XRCID("rbMozilla"), AstyleConfigDlg::OnStyleChange)
61 EVT_RADIOBUTTON(XRCID("rbPico"), AstyleConfigDlg::OnStyleChange)
62 EVT_RADIOBUTTON(XRCID("rbLisp"), AstyleConfigDlg::OnStyleChange)
63 EVT_RADIOBUTTON(XRCID("rbCustom"), AstyleConfigDlg::OnStyleChange)
64@@ -158,7 +159,7 @@ int Foo(bool isBar)\n\
65 XRCCTRL(*this, "rbVTK", wxRadioButton)->SetValue(true);
66 break;
67 #undef AS_VTK
68-#define AS_BANNER "\
69+#define AS_RATLIFF "\
70 int Foo(bool isBar) {\n\
71 if (isBar) {\n\
72 bar();\n\
73@@ -167,11 +168,11 @@ int Foo(bool isBar) {\n\
74 else\n\
75 return 0;\n\
76 }"
77- case aspsBanner:
78- sample = _T(AS_BANNER);
79- XRCCTRL(*this, "rbBanner", wxRadioButton)->SetValue(true);
80+ case aspsRatliff:
81+ sample = _T(AS_RATLIFF);
82+ XRCCTRL(*this, "rbRatliff", wxRadioButton)->SetValue(true);
83 break;
84-#undef AS_BANNER
85+#undef AS_RATLIFF
86 #define AS_GNU "\
87 int Foo(bool isBar)\n\
88 {\n\
89@@ -307,8 +308,8 @@ void AstyleConfigDlg::OnStyleChange(wxCommandEvent& event)
90 SetStyle(aspsWhitesmith);
91 else if (event.GetId() == XRCID("rbVTK"))
92 SetStyle(aspsVTK);
93- else if (event.GetId() == XRCID("rbBanner"))
94- SetStyle(aspsBanner);
95+ else if (event.GetId() == XRCID("rbRatliff"))
96+ SetStyle(aspsRatliff);
97 else if (event.GetId() == XRCID("rbGNU"))
98 SetStyle(aspsGnu);
99 else if (event.GetId() == XRCID("rbLinux"))
100@@ -376,6 +377,7 @@ void AstyleConfigDlg::LoadSettings()
101 XRCCTRL(*this, "chkAttachExternC", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_extern_c"), false));
102 XRCCTRL(*this, "chkAttachNamespaces", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_namespaces"), false));
103 XRCCTRL(*this, "chkAttachInlines", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_inlines"), false));
104+ XRCCTRL(*this, "chkAttachClosingWhiles", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_closing_whiles"), false));
105
106 XRCCTRL(*this, "spnIndentation", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/indentation"), 4));
107 XRCCTRL(*this, "spnContinuation", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/continuation"), 0));
108@@ -386,6 +388,7 @@ void AstyleConfigDlg::LoadSettings()
109 XRCCTRL(*this, "chkIndentLabels", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_labels"), false));
110 XRCCTRL(*this, "chkIndentModifiers", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_modifiers"), false));
111 XRCCTRL(*this, "chkIndentNamespaces", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_namespaces"), false));
112+ XRCCTRL(*this, "chkIndentAfterParens", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_after_parens"), false));
113 XRCCTRL(*this, "chkIndentSwitches", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_switches"), false));
114 XRCCTRL(*this, "chkIndentPreprocBlock", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_preproc_block"), false));
115 XRCCTRL(*this, "chkIndentPreprocDefine", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_preproc_define"), false));
116@@ -399,6 +402,10 @@ void AstyleConfigDlg::LoadSettings()
117 XRCCTRL(*this, "chkAddBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/add_brackets"), false));
118 XRCCTRL(*this, "chkAddOneLineBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/add_one_line_brackets"), false));
119 XRCCTRL(*this, "chkRemoveBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/remove_brackets"), false));
120+ XRCCTRL(*this, "chkBreakReturnType", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_return_type"), false));
121+ XRCCTRL(*this, "chkBreakReturnTypeDecl", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_return_type_decl"),false));
122+ XRCCTRL(*this, "chkAttachReturnType", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_return_type"), false));
123+ XRCCTRL(*this, "chkAttachReturnTypeDecl",wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_return_type_decl"),false));
124 XRCCTRL(*this, "chkKeepBlocks", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_blocks"), false));
125 XRCCTRL(*this, "chkKeepHeaders", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_headers"), false));
126 XRCCTRL(*this, "chkKeepStatements", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_statements"), false));
127@@ -455,8 +462,8 @@ void AstyleConfigDlg::SaveSettings()
128 style = aspsWhitesmith;
129 else if (XRCCTRL(*this, "rbVTK", wxRadioButton)->GetValue())
130 style = aspsVTK;
131- else if (XRCCTRL(*this, "rbBanner", wxRadioButton)->GetValue())
132- style = aspsBanner;
133+ else if (XRCCTRL(*this, "rbRatliff", wxRadioButton)->GetValue())
134+ style = aspsRatliff;
135 else if (XRCCTRL(*this, "rbGNU", wxRadioButton)->GetValue())
136 style = aspsGnu;
137 else if (XRCCTRL(*this, "rbLinux", wxRadioButton)->GetValue())
138@@ -467,6 +474,8 @@ void AstyleConfigDlg::SaveSettings()
139 style = asps1TBS;
140 else if (XRCCTRL(*this, "rbGoogle", wxRadioButton)->GetValue())
141 style = aspsGoogle;
142+ else if (XRCCTRL(*this, "rbMozilla", wxRadioButton)->GetValue())
143+ style = aspsMozilla;
144 else if (XRCCTRL(*this, "rbPico", wxRadioButton)->GetValue())
145 style = aspsPico;
146 else if (XRCCTRL(*this, "rbLisp", wxRadioButton)->GetValue())
147@@ -480,6 +489,7 @@ void AstyleConfigDlg::SaveSettings()
148 cfg->Write(_T("/attach_extern_c"), XRCCTRL(*this, "chkAttachExternC", wxCheckBox)->GetValue());
149 cfg->Write(_T("/attach_namespaces"), XRCCTRL(*this, "chkAttachNamespaces", wxCheckBox)->GetValue());
150 cfg->Write(_T("/attach_inlines"), XRCCTRL(*this, "chkAttachInlines", wxCheckBox)->GetValue());
151+ cfg->Write(_T("/attach_closing_whiles"), XRCCTRL(*this, "chkAttachClosingWhiles", wxCheckBox)->GetValue());
152
153 cfg->Write(_T("/indentation"), XRCCTRL(*this, "spnIndentation", wxSpinCtrl)->GetValue());
154 cfg->Write(_T("/continuation"), XRCCTRL(*this, "spnContinuation", wxSpinCtrl)->GetValue());
155@@ -490,6 +500,7 @@ void AstyleConfigDlg::SaveSettings()
156 cfg->Write(_T("/indent_labels"), XRCCTRL(*this, "chkIndentLabels", wxCheckBox)->GetValue());
157 cfg->Write(_T("/indent_modifiers"), XRCCTRL(*this, "chkIndentModifiers", wxCheckBox)->GetValue());
158 cfg->Write(_T("/indent_namespaces"), XRCCTRL(*this, "chkIndentNamespaces", wxCheckBox)->GetValue());
159+ cfg->Write(_T("/indent_after_parens"), XRCCTRL(*this, "chkIndentAfterParens", wxCheckBox)->GetValue());
160 cfg->Write(_T("/indent_switches"), XRCCTRL(*this, "chkIndentSwitches", wxCheckBox)->GetValue());
161 cfg->Write(_T("/indent_preproc_block"), XRCCTRL(*this, "chkIndentPreprocBlock", wxCheckBox)->GetValue());
162 cfg->Write(_T("/indent_preproc_define"), XRCCTRL(*this, "chkIndentPreprocDefine", wxCheckBox)->GetValue());
163@@ -503,6 +514,10 @@ void AstyleConfigDlg::SaveSettings()
164 cfg->Write(_T("/add_brackets"), XRCCTRL(*this, "chkAddBrackets", wxCheckBox)->GetValue());
165 cfg->Write(_T("/add_one_line_brackets"), XRCCTRL(*this, "chkAddOneLineBrackets", wxCheckBox)->GetValue());
166 cfg->Write(_T("/remove_brackets"), XRCCTRL(*this, "chkRemoveBrackets", wxCheckBox)->GetValue());
167+ cfg->Write(_T("/break_return_type_decl"), XRCCTRL(*this, "chkBreakReturnTypeDecl", wxCheckBox)->GetValue());
168+ cfg->Write(_T("/break_return_type"), XRCCTRL(*this, "chkBreakReturnType", wxCheckBox)->GetValue());
169+ cfg->Write(_T("/attach_return_type"), XRCCTRL(*this, "chkAttachReturnType", wxCheckBox)->GetValue());
170+ cfg->Write(_T("/attach_return_type_decl"), XRCCTRL(*this, "chkAttachReturnTypeDecl",wxCheckBox)->GetValue());
171 cfg->Write(_T("/keep_blocks"), XRCCTRL(*this, "chkKeepBlocks", wxCheckBox)->GetValue());
172 cfg->Write(_T("/keep_headers"), XRCCTRL(*this, "chkKeepHeaders", wxCheckBox)->GetValue());
173 cfg->Write(_T("/keep_statements"), XRCCTRL(*this, "chkKeepStatements", wxCheckBox)->GetValue());
174diff --git a/src/plugins/astyle/astylepredefinedstyles.h b/src/plugins/astyle/astylepredefinedstyles.h
175index e00ae4907..1bf72f0ea 100644
176--- a/src/plugins/astyle/astylepredefinedstyles.h
177+++ b/src/plugins/astyle/astylepredefinedstyles.h
178@@ -14,7 +14,7 @@ enum AStylePredefinedStyle
179 aspsStroustrup,
180 aspsWhitesmith,
181 aspsVTK,
182- aspsBanner,
183+ aspsRatliff,
184 aspsGnu,
185 aspsLinux,
186 aspsHorstmann,
187diff --git a/src/plugins/astyle/dlgformattersettings.cpp b/src/plugins/astyle/dlgformattersettings.cpp
188index 6e2d264ab..683693038 100644
189--- a/src/plugins/astyle/dlgformattersettings.cpp
190+++ b/src/plugins/astyle/dlgformattersettings.cpp
191@@ -39,8 +39,8 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
192 formatter.setFormattingStyle(astyle::STYLE_WHITESMITH);
193 else if (XRCCTRL(*m_dlg, "rbVTK", wxRadioButton)->GetValue())
194 formatter.setFormattingStyle(astyle::STYLE_VTK);
195- else if (XRCCTRL(*m_dlg, "rbBanner", wxRadioButton)->GetValue())
196- formatter.setFormattingStyle(astyle::STYLE_BANNER);
197+ else if (XRCCTRL(*m_dlg, "rbRatliff", wxRadioButton)->GetValue())
198+ formatter.setFormattingStyle(astyle::STYLE_RATLIFF);
199 else if (XRCCTRL(*m_dlg, "rbGNU", wxRadioButton)->GetValue())
200 formatter.setFormattingStyle(astyle::STYLE_GNU);
201 else if (XRCCTRL(*m_dlg, "rbLinux", wxRadioButton)->GetValue())
202@@ -58,10 +58,11 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
203 else if (XRCCTRL(*m_dlg, "rbLisp", wxRadioButton)->GetValue())
204 formatter.setFormattingStyle(astyle::STYLE_LISP);
205
206- formatter.setAttachClass(XRCCTRL(*m_dlg, "chkAttachClasses", wxCheckBox)->GetValue());
207- formatter.setAttachExternC(XRCCTRL(*m_dlg, "chkAttachExternC", wxCheckBox)->GetValue());
208- formatter.setAttachNamespace(XRCCTRL(*m_dlg, "chkAttachNamespaces", wxCheckBox)->GetValue());
209- formatter.setAttachInline(XRCCTRL(*m_dlg, "chkAttachInlines", wxCheckBox)->GetValue());
210+ formatter.setAttachClass(XRCCTRL(*m_dlg, "chkAttachClasses", wxCheckBox)->GetValue());
211+ formatter.setAttachExternC(XRCCTRL(*m_dlg, "chkAttachExternC", wxCheckBox)->GetValue());
212+ formatter.setAttachNamespace(XRCCTRL(*m_dlg, "chkAttachNamespaces", wxCheckBox)->GetValue());
213+ formatter.setAttachInline(XRCCTRL(*m_dlg, "chkAttachInlines", wxCheckBox)->GetValue());
214+ formatter.setAttachClosingWhile(XRCCTRL(*m_dlg, "chkAttachClosingWhiles", wxCheckBox)->GetValue());
215
216 bool value = XRCCTRL(*m_dlg, "chkForceUseTabs", wxCheckBox)->GetValue();
217 int spaceNum = XRCCTRL(*m_dlg, "spnIndentation", wxSpinCtrl)->GetValue();
218@@ -79,6 +80,7 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
219 formatter.setLabelIndent(XRCCTRL(*m_dlg, "chkIndentLabels", wxCheckBox)->GetValue());
220 formatter.setModifierIndent(XRCCTRL(*m_dlg, "chkIndentModifiers", wxCheckBox)->GetValue());
221 formatter.setNamespaceIndent(XRCCTRL(*m_dlg, "chkIndentNamespaces", wxCheckBox)->GetValue());
222+ formatter.setAfterParenIndent(XRCCTRL(*m_dlg, "chkIndentAfterParens", wxCheckBox)->GetValue());
223 formatter.setSwitchIndent(XRCCTRL(*m_dlg, "chkIndentSwitches", wxCheckBox)->GetValue());
224 formatter.setPreprocBlockIndent(XRCCTRL(*m_dlg, "chkIndentPreprocBlock", wxCheckBox)->GetValue());
225 formatter.setPreprocDefineIndent(XRCCTRL(*m_dlg, "chkIndentPreprocDefine", wxCheckBox)->GetValue());
226@@ -88,11 +90,15 @@ void DlgFormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
227 formatter.setMinConditionalIndentOption(minConditionalEvent);
228 formatter.setMaxInStatementIndentLength( wxAtoi(XRCCTRL(*m_dlg, "txtMaxInStatementIndent", wxTextCtrl)->GetValue()) );
229
230- formatter.setBreakClosingHeaderBracketsMode(XRCCTRL(*m_dlg, "chkBreakClosing", wxCheckBox)->GetValue());
231+ formatter.setBreakClosingHeaderBracesMode(XRCCTRL(*m_dlg, "chkBreakClosing", wxCheckBox)->GetValue());
232 formatter.setBreakElseIfsMode(XRCCTRL(*m_dlg, "chkBreakElseIfs", wxCheckBox)->GetValue());
233- formatter.setAddBracketsMode(XRCCTRL(*m_dlg, "chkAddBrackets", wxCheckBox)->GetValue());
234- formatter.setAddOneLineBracketsMode(XRCCTRL(*m_dlg, "chkAddOneLineBrackets", wxCheckBox)->GetValue());
235- formatter.setRemoveBracketsMode(XRCCTRL(*m_dlg, "chkRemoveBrackets", wxCheckBox)->GetValue());
236+ formatter.setAddBracesMode(XRCCTRL(*m_dlg, "chkAddBrackets", wxCheckBox)->GetValue());
237+ formatter.setAddOneLineBracesMode(XRCCTRL(*m_dlg, "chkAddOneLineBrackets", wxCheckBox)->GetValue());
238+ formatter.setRemoveBracesMode(XRCCTRL(*m_dlg, "chkRemoveBrackets", wxCheckBox)->GetValue());
239+ formatter.setBreakReturnType(XRCCTRL(*m_dlg, "chkBreakReturnType", wxCheckBox)->GetValue());
240+ formatter.setBreakReturnTypeDecl(XRCCTRL(*m_dlg, "chkBreakReturnTypeDecl", wxCheckBox)->GetValue());
241+ formatter.setAttachReturnType(XRCCTRL(*m_dlg, "chkAttachReturnType", wxCheckBox)->GetValue());
242+ formatter.setAttachReturnTypeDecl(XRCCTRL(*m_dlg, "chkAttachReturnTypeDecl", wxCheckBox)->GetValue());
243 formatter.setBreakOneLineBlocksMode(!XRCCTRL(*m_dlg, "chkKeepBlocks", wxCheckBox)->GetValue());
244 formatter.setBreakOneLineHeadersMode(!XRCCTRL(*m_dlg, "chkKeepHeaders", wxCheckBox)->GetValue());
245 formatter.setBreakOneLineStatementsMode(!XRCCTRL(*m_dlg, "chkKeepStatements", wxCheckBox)->GetValue());
246diff --git a/src/plugins/astyle/formattersettings.cpp b/src/plugins/astyle/formattersettings.cpp
247index 8f60ddde2..b875ddcba 100644
248--- a/src/plugins/astyle/formattersettings.cpp
249+++ b/src/plugins/astyle/formattersettings.cpp
250@@ -54,8 +54,8 @@ void FormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
251 formatter.setFormattingStyle(astyle::STYLE_VTK);
252 break;
253
254- case aspsBanner: // Banner
255- formatter.setFormattingStyle(astyle::STYLE_BANNER);
256+ case aspsRatliff: // Ratliff
257+ formatter.setFormattingStyle(astyle::STYLE_RATLIFF);
258 break;
259
260 case aspsGnu: // GNU
261@@ -123,7 +123,7 @@ void FormatterSettings::ApplyTo(astyle::ASFormatter& formatter)
262 formatter.setMinConditionalIndentOption(cfg->ReadInt(_T("/min_conditional_indent"), 2));
263 formatter.setMaxInStatementIndentLength(cfg->ReadInt(_T("/max_instatement_indent"), 40));
264
265- formatter.setBreakClosingHeaderBracketsMode(cfg->ReadBool(_T("/break_closing")));
266+ formatter.setBreakClosingHeaderBracesMode(cfg->ReadBool(_T("/break_closing")));
267 formatter.setBreakElseIfsMode(cfg->ReadBool(_T("/break_elseifs")));
268 formatter.setAddBracketsMode(cfg->ReadBool(_T("/add_brackets")));
269 formatter.setAddOneLineBracketsMode(cfg->ReadBool(_T("/add_one_line_brackets")));
270diff --git a/src/plugins/astyle/resources/configuration.xrc b/src/plugins/astyle/resources/configuration.xrc
271index 86e0b0df9..50d8cfad0 100644
272--- a/src/plugins/astyle/resources/configuration.xrc
273+++ b/src/plugins/astyle/resources/configuration.xrc
274@@ -61,9 +61,9 @@
275 <border>5</border>
276 </object>
277 <object class="sizeritem">
278- <object class="wxRadioButton" name="rbBanner">
279- <label>Banner</label>
280- <tooltip>Banner style uses attached, indented brackets. Switch blocks and class blocks are indented to prevent a &apos;hanging indent&apos; with following case statements and C++ class modifiers (public, private, protected).</tooltip>
281+ <object class="wxRadioButton" name="rbRatliff">
282+ <label>Ratliff</label>
283+ <tooltip>Ratliff style uses attached, indented brackets. Switch blocks and class blocks are indented to prevent a &apos;hanging indent&apos; with following case statements and C++ class modifiers (public, private, protected).</tooltip>
284 </object>
285 <flag>wxTOP|wxLEFT|wxRIGHT|wxALIGN_LEFT</flag>
286 <border>5</border>
287@@ -212,6 +212,13 @@
288 <flag>wxTOP|wxALIGN_LEFT</flag>
289 <border>5</border>
290 </object>
291+ <object class="sizeritem">
292+ <object class="wxCheckBox" name="chkAttachClosingWhiles">
293+ <label>Attach closing &quot;while&quot;</label>
294+ </object>
295+ <flag>wxTOP|wxALIGN_LEFT</flag>
296+ <border>5</border>
297+ </object>
298 </object>
299 <flag>wxEXPAND</flag>
300 <border>5</border>
301@@ -319,6 +326,13 @@
302 <flag>wxTOP|wxALIGN_LEFT</flag>
303 <border>5</border>
304 </object>
305+ <object class="sizeritem">
306+ <object class="wxCheckBox" name="chkIndentAfterParens">
307+ <label>Indent after parens</label>
308+ </object>
309+ <flag>wxTOP|wxALIGN_LEFT</flag>
310+ <border>5</border>
311+ </object>
312 <object class="sizeritem">
313 <object class="wxCheckBox" name="chkIndentSwitches">
314 <label>Indent switches (keyword case:)</label>
315@@ -427,21 +441,49 @@
316 </object>
317 <object class="sizeritem">
318 <object class="wxCheckBox" name="chkAddBrackets">
319- <label>Add brackets to unbracketed one line conditional statements</label>
320+ <label>Add braces to unbraced one line conditional statements</label>
321 </object>
322 <flag>wxTOP|wxALIGN_LEFT</flag>
323 <border>5</border>
324 </object>
325 <object class="sizeritem">
326 <object class="wxCheckBox" name="chkAddOneLineBrackets">
327- <label>Add one line brackets to unbracketed one line conditional statements</label>
328+ <label>Add one line braces to unbraced one line conditional statements</label>
329 </object>
330 <flag>wxTOP|wxALIGN_LEFT</flag>
331 <border>5</border>
332 </object>
333 <object class="sizeritem">
334 <object class="wxCheckBox" name="chkRemoveBrackets">
335- <label>Remove brackets from conditional statements (single statement on a single line)</label>
336+ <label>Remove braces from conditional statements (single statement on a single line)</label>
337+ </object>
338+ <flag>wxTOP|wxALIGN_LEFT</flag>
339+ <border>5</border>
340+ </object>
341+ <object class="sizeritem">
342+ <object class="wxCheckBox" name="chkBreakReturnType">
343+ <label>Break the return type from the function name in function definitions</label>
344+ </object>
345+ <flag>wxTOP|wxALIGN_LEFT</flag>
346+ <border>5</border>
347+ </object>
348+ <object class="sizeritem">
349+ <object class="wxCheckBox" name="chkBreakReturnTypeDecl">
350+ <label>Break the return type from the function name in function declarations or signatures</label>
351+ </object>
352+ <flag>wxTOP|wxALIGN_LEFT</flag>
353+ <border>5</border>
354+ </object>
355+ <object class="sizeritem">
356+ <object class="wxCheckBox" name="chkAttachReturnType">
357+ <label>Attach the return type to the function name in function definitions</label>
358+ </object>
359+ <flag>wxTOP|wxALIGN_LEFT</flag>
360+ <border>5</border>
361+ </object>
362+ <object class="sizeritem">
363+ <object class="wxCheckBox" name="chkAttachReturnTypeDecl">
364+ <label>Attach the return type to the function name in function declarations or signatures</label>
365 </object>
366 <flag>wxTOP|wxALIGN_LEFT</flag>
367 <border>5</border>
An open source, cross platform, free C++ IDE
This page took 0.105833 seconds and 4 git commands to generate.