1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ui/*.[ch] indentation consistent.

Browse Source 
Switch ui/clopts_common.c, ui/filter_files.[ch], and ui/summary.[ch] to
4 space indentation. This brings them in line with all of the other
files in that directory and with ui/qt.

Fix the modelines in ui/qt/models/filter_list_model.cpp.
This commit is contained in:
Gerald Combs 2021-03-01 14:29:52 -08:00 committed by Wireshark GitLab Utility
parent 8f7303df82
commit 25edc7439b
7 changed files with 693 additions and 699 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.editorconfig
View File

@ -79,9 +79,6 @@ indent_size = 2
[file.[ch]] [file.[ch]]
indent_size = 2 indent_size = 2
[filter_files.[ch]]
indent_size = 2
[frame_tvbuff.[ch]] [frame_tvbuff.[ch]]
indent_style = tab indent_style = tab
indent_size = tab indent_size = tab
@ -92,9 +89,6 @@ indent_size = 8
[ringbuffer.[ch]] [ringbuffer.[ch]]
indent_size = 2 indent_size = 2
[summary.[ch]]
indent_size = 2
[randpkt_core.[ch]] [randpkt_core.[ch]]
indent_style = tab indent_style = tab
indent_size = tab indent_size = tab

6
ui/clopts_common.c
View File

@ -111,11 +111,11 @@ get_positive_double(const char *string, const char *name)
* Editor modelines - https://www.wireshark.org/tools/modelines.html * Editor modelines - https://www.wireshark.org/tools/modelines.html
* *
* Local Variables: * Local Variables:
* c-basic-offset: 2 * c-basic-offset: 4
* tab-width: 8 * tab-width: 8
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */

6
ui/filter_files.c
View File

@ -567,11 +567,11 @@ save_filter_list(filter_list_type_t list_type)
* Editor modelines - https://www.wireshark.org/tools/modelines.html * Editor modelines - https://www.wireshark.org/tools/modelines.html
* *
* Local Variables: * Local Variables:
* c-basic-offset: 2 * c-basic-offset: 4
* tab-width: 8 * tab-width: 8
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */

6
ui/filter_files.h
View File

@ -92,11 +92,11 @@ void free_filter_lists(void);
* Editor modelines - https://www.wireshark.org/tools/modelines.html * Editor modelines - https://www.wireshark.org/tools/modelines.html
* *
* Local Variables: * Local Variables:
* c-basic-offset: 2 * c-basic-offset: 4
* tab-width: 8 * tab-width: 8
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* vi: set shiftwidth=2 tabstop=8 expandtab: * ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */

6
ui/qt/models/filter_list_model.cpp
View File

@ -308,11 +308,11 @@ bool FilterListModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
* Editor modelines - https://www.wireshark.org/tools/modelines.html * Editor modelines - https://www.wireshark.org/tools/modelines.html
* *
* Local Variables: * Local Variables:
* c-basic-offset: 2 * c-basic-offset: 4
* tab-width: 8 * tab-width: 8
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* vi: set shiftwidth=2 tabstop=8 expandtab: * vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */

6
ui/summary.c
View File

@ -273,11 +273,11 @@ summary_fill_in_capture(capture_file *cf,capture_options *capture_opts, summary_
* Editor modelines - https://www.wireshark.org/tools/modelines.html * Editor modelines - https://www.wireshark.org/tools/modelines.html
* *
* Local Variables: * Local Variables:
* c-basic-offset: 2 * c-basic-offset: 4
* tab-width: 8 * tab-width: 8
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* ex: set shiftwidth=2 tabstop=8 expandtab: * ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */

6
ui/summary.h
View File

@ -89,11 +89,11 @@ summary_fill_in_capture(capture_file *cf, capture_options *capture_opts, summary
* Editor modelines - https://www.wireshark.org/tools/modelines.html * Editor modelines - https://www.wireshark.org/tools/modelines.html
* *
* Local Variables: * Local Variables:
* c-basic-offset: 2 * c-basic-offset: 4
* tab-width: 8 * tab-width: 8
* indent-tabs-mode: nil * indent-tabs-mode: nil
* End: * End:
* *
* vi: set shiftwidth=2 tabstop=8 expandtab: * ex: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true: * :indentSize=4:tabSize=8:noTabs=true:
*/ */