diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-02-25 13:34:07 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-02-25 21:34:36 +0000 |
commit | e9b2859c45d15fc30dcec2c54fab211476e21392 (patch) | |
tree | b18d6a7a69b7adf4dbc32ba2e8cbfdb09dc2baa0 /ui/qt | |
parent | 12808dea8107b67f3de3fa52f409ce0ab600fa16 (diff) | |
download | wireshark-e9b2859c45d15fc30dcec2c54fab211476e21392.tar.gz |
Clean up modelines and indentation.
HT tab stops are set every 8 spaces on UN*X; UN*X tools that treat an HT
character as tabbing to 4-space tab stops, or that even are configurable
but *default* to 4-space tab stops (I'm looking at *you*, Xcode!) are
broken. tab-width: 4, tabstop=4, and tabSize=4 are errors if you ever
expect anybody to look at your file with a UN*X tool, and every text
file will probably be looked at by a UN*X tool at some point, so Don't
Do That.
Adjust indentation to reflect the mode lines.
Change-Id: Icf0831717de10fc615971fa1cf75af2f1ea2d03d
Reviewed-on: https://code.wireshark.org/review/14150
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt')
-rw-r--r-- | ui/qt/compiled_filter_output.cpp | 7 | ||||
-rw-r--r-- | ui/qt/compiled_filter_output.h | 6 | ||||
-rw-r--r-- | ui/qt/enabled_protocols_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/enabled_protocols_dialog.h | 2 | ||||
-rw-r--r-- | ui/qt/lbm_lbtrm_transport_dialog.cpp | 6 | ||||
-rw-r--r-- | ui/qt/lbm_lbtrm_transport_dialog.h | 6 | ||||
-rw-r--r-- | ui/qt/lbm_lbtru_transport_dialog.cpp | 6 | ||||
-rw-r--r-- | ui/qt/lbm_lbtru_transport_dialog.h | 6 | ||||
-rw-r--r-- | ui/qt/lbm_stream_dialog.cpp | 6 | ||||
-rw-r--r-- | ui/qt/lbm_stream_dialog.h | 6 | ||||
-rw-r--r-- | ui/qt/lbm_uimflow_dialog.cpp | 6 | ||||
-rw-r--r-- | ui/qt/lbm_uimflow_dialog.h | 6 |
12 files changed, 32 insertions, 33 deletions
diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp index 7ccdb86988..703857ed08 100644 --- a/ui/qt/compiled_filter_output.cpp +++ b/ui/qt/compiled_filter_output.cpp @@ -128,11 +128,10 @@ void CompiledFilterOutput::copyFilterText() // // Local variables: // c-basic-offset: 4 -// tab-width: 4 +// tab-width: 8 // indent-tabs-mode: nil // End: // -// vi: set shiftwidth=4 tabstop=4 expandtab: -// :indentSize=4:tabSize=4:noTabs=true: +// vi: set shiftwidth=4 tabstop=8 expandtab: +// :indentSize=4:tabSize=8:noTabs=true: // - diff --git a/ui/qt/compiled_filter_output.h b/ui/qt/compiled_filter_output.h index f2a3d90c3f..44642a88e7 100644 --- a/ui/qt/compiled_filter_output.h +++ b/ui/qt/compiled_filter_output.h @@ -65,10 +65,10 @@ private slots: // // Local variables: // c-basic-offset: 4 -// tab-width: 4 +// tab-width: 8 // indent-tabs-mode: nil // End: // -// vi: set shiftwidth=4 tabstop=4 expandtab: -// :indentSize=4:tabSize=4:noTabs=true: +// vi: set shiftwidth=4 tabstop=8 expandtab: +// :indentSize=4:tabSize=8:noTabs=true: // diff --git a/ui/qt/enabled_protocols_dialog.cpp b/ui/qt/enabled_protocols_dialog.cpp index 283f2ab0f6..143611a952 100644 --- a/ui/qt/enabled_protocols_dialog.cpp +++ b/ui/qt/enabled_protocols_dialog.cpp @@ -345,7 +345,7 @@ void EnabledProtocolsDialog::on_buttonBox_helpRequested() * * Local Variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * diff --git a/ui/qt/enabled_protocols_dialog.h b/ui/qt/enabled_protocols_dialog.h index 761a4f4ec9..6f84a92b21 100644 --- a/ui/qt/enabled_protocols_dialog.h +++ b/ui/qt/enabled_protocols_dialog.h @@ -68,7 +68,7 @@ private: * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index 8bf3553aa3..a2ff0118a5 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -1635,10 +1635,10 @@ void LBMLBTRMTransportDialog::actionSourceAutoResizeColumns_triggered(void) * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h index a686e99f5a..bb0f75962e 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.h +++ b/ui/qt/lbm_lbtrm_transport_dialog.h @@ -126,10 +126,10 @@ class LBMLBTRMTransportDialog : public QDialog * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index 190ff5ae71..304c38c6bc 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -2233,10 +2233,10 @@ void LBMLBTRUTransportDialog::actionReceiverAutoResizeColumns_triggered(void) * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h index 48b2b79396..25d3ac64b6 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.h +++ b/ui/qt/lbm_lbtru_transport_dialog.h @@ -150,10 +150,10 @@ class LBMLBTRUTransportDialog : public QDialog * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index b687cfc9a5..f9970bedbe 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -443,10 +443,10 @@ void LBMStreamDialog::closeDialog(void) * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/ui/qt/lbm_stream_dialog.h b/ui/qt/lbm_stream_dialog.h index 53abf26d4b..8310b0a28d 100644 --- a/ui/qt/lbm_stream_dialog.h +++ b/ui/qt/lbm_stream_dialog.h @@ -76,10 +76,10 @@ class LBMStreamDialog : public QDialog * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp index f1b74517be..b34c57b81e 100644 --- a/ui/qt/lbm_uimflow_dialog.cpp +++ b/ui/qt/lbm_uimflow_dialog.cpp @@ -662,10 +662,10 @@ void LBMUIMFlowDialog::on_actionMoveDown1_triggered(void) * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ diff --git a/ui/qt/lbm_uimflow_dialog.h b/ui/qt/lbm_uimflow_dialog.h index 0e68a8f33e..c77f126804 100644 --- a/ui/qt/lbm_uimflow_dialog.h +++ b/ui/qt/lbm_uimflow_dialog.h @@ -110,10 +110,10 @@ class LBMUIMFlowDialog : public QDialog * * Local variables: * c-basic-offset: 4 - * tab-width: 4 + * tab-width: 8 * indent-tabs-mode: nil * End: * - * vi: set shiftwidth=4 tabstop=4 expandtab: - * :indentSize=4:tabSize=4:noTabs=true: + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: */ |