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>

diff --git a/epan/dissectors/dcerpc/idl2wrs.c b/epan/dissectors/dcerpc/idl2wrs.c
index 66104884a41773ff497db871a0e7560fcd775bd5..93d5ee116a5510fec35665476934ed750c2a7625 100644 (file)
--- a/epan/dissectors/dcerpc/idl2wrs.c
+++ b/epan/dissectors/dcerpc/idl2wrs.c
@@ -3518,12 +3518,11 @@ int main(int argc, char *argv[])
  * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */
-

diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c
index 014f817d4213cf1435bdf9fbc1550c3f7aba32ec..43369049e370b801081a85025b8ceae760f702dd 100644 (file)
--- a/epan/dissectors/packet-h1.c
+++ b/epan/dissectors/packet-h1.c
@@ -50,44 +50,44 @@ static dissector_handle_t data_handle;
 #define RESPONSE_BLOCK  0x0F
 
 static const value_string block_type_vals[] = {
-  { EMPTY_BLOCK,    "Empty Block" },
-  { OPCODE_BLOCK,   "Opcode Block" },
-  { REQUEST_BLOCK,  "Request Block" },
-  { RESPONSE_BLOCK, "Response Block" },
-  {0, NULL}
+    { EMPTY_BLOCK,    "Empty Block" },
+    { OPCODE_BLOCK,   "Opcode Block" },
+    { REQUEST_BLOCK,  "Request Block" },
+    { RESPONSE_BLOCK, "Response Block" },
+    {0, NULL}
 };
 
 
 static const value_string opcode_vals[] = {
-  {3, "Write Request"},
-  {4, "Write Response"},
-  {5, "Read Request"},
-  {6, "Read Response"},
-  {0, NULL}
+    {3, "Write Request"},
+    {4, "Write Response"},
+    {5, "Read Request"},
+    {6, "Read Response"},
+    {0, NULL}
 };
 
 static const value_string org_vals[] = {
-  {0x01, "DB"},
-  {0x02, "MB"},
-  {0x03, "EB"},
-  {0x04, "AB"},
-  {0x05, "PB"},
-  {0x06, "ZB"},
-  {0x07, "TB"},
-  {0x08, "BS"},
-  {0x09, "AS"},
-  {0x0a, "DX"},
-  {0x10, "DE"},
-  {0x11, "QB"},
-  {0, NULL}
+    {0x01, "DB"},
+    {0x02, "MB"},
+    {0x03, "EB"},
+    {0x04, "AB"},
+    {0x05, "PB"},
+    {0x06, "ZB"},
+    {0x07, "TB"},
+    {0x08, "BS"},
+    {0x09, "AS"},
+    {0x0a, "DX"},
+    {0x10, "DE"},
+    {0x11, "QB"},
+    {0, NULL}
 };
 
 static const value_string returncode_vals[] = {
-  {0x00, "No error"},
-  {0x02, "Requested block does not exist"},
-  {0x03, "Requested block too small"},
-  {0xFF, "Error, reason unknown"},
-  {0, NULL}
+    {0x00, "No error"},
+    {0x02, "Requested block does not exist"},
+    {0x03, "Requested block too small"},
+    {0xFF, "Error, reason unknown"},
+    {0, NULL}
 };
 
 static gint ett_h1 = -1;
@@ -273,10 +273,10 @@ proto_reg_handoff_h1(void)
  *
  * Local Variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * ex: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */

diff --git a/epan/dissectors/packet-lbm.h b/epan/dissectors/packet-lbm.h
index ec0bef2c6821bfc35d65cf982edfb6e13d662511..0b9deb901ebbd5f55136293971987a3db9663b05 100644 (file)
--- a/epan/dissectors/packet-lbm.h
+++ b/epan/dissectors/packet-lbm.h
@@ -435,10 +435,10 @@ void lbm_topic_add(guint64 channel, guint32 topic_index, const char * name);
  *
  * 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/epan/dissectors/packet-lbtrm.h b/epan/dissectors/packet-lbtrm.h
index 5d14d980c084e3ada3efc22e9c3dcf8a9f9ae85f..86daf741f64d3cce05db1c3769aa96643bdcd438 100644 (file)
--- a/epan/dissectors/packet-lbtrm.h
+++ b/epan/dissectors/packet-lbtrm.h
@@ -55,10 +55,10 @@ char * lbtrm_transport_source_string(const address * source_address, guint16 sou
  *
  * 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/epan/dissectors/packet-lbtru.h b/epan/dissectors/packet-lbtru.h
index f5be46b85489bcd6cfd57fd72b73c169817773c5..efea01725501fcc5f210fe51687e3e5529de20bc 100644 (file)
--- a/epan/dissectors/packet-lbtru.h
+++ b/epan/dissectors/packet-lbtru.h
@@ -66,10 +66,10 @@ char * lbtru_transport_source_string(const address * source_address, guint16 sou
  *
  * 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/epan/dissectors/packet-lbttcp.h b/epan/dissectors/packet-lbttcp.h
index c0d9ff99be0edaffcc46a91d07621c2cf9f97072..d805c2cfa42f017e63b728bcc689f78f2fdbb3f1 100644 (file)
--- a/epan/dissectors/packet-lbttcp.h
+++ b/epan/dissectors/packet-lbttcp.h
@@ -56,10 +56,10 @@ void lbttcp_transport_sid_add(const address * source_address, guint16 source_por
  *
  * 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/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c
index 4e6866d5bb076fd2ff307f1792e98837a86d6123..1daa98d9879eeb7ea46256e63f01f509b3c2c820 100755 (executable)
--- a/epan/dissectors/packet-rtitcp.c
+++ b/epan/dissectors/packet-rtitcp.c
@@ -983,10 +983,10 @@ proto_reg_handoff_rtitcp(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/epan/dissectors/packet-tdmop.c b/epan/dissectors/packet-tdmop.c
index a2e32f940de79944919d73a0b554e5fb1dea7ae2..677649be2c26fe89d4092814dd171d740b21edb4 100644 (file)
--- a/epan/dissectors/packet-tdmop.c
+++ b/epan/dissectors/packet-tdmop.c
@@ -387,10 +387,10 @@ void proto_reg_handoff_tdmop(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/epan/dissectors/packet-userlog.c b/epan/dissectors/packet-userlog.c
index a33d24002bce71a19f803dd146e77e91525a7c4b..22f42995d33e2e35c16e94b589aa46f7539fc35d 100644 (file)
--- a/epan/dissectors/packet-userlog.c
+++ b/epan/dissectors/packet-userlog.c
@@ -422,11 +422,11 @@ proto_reg_handoff_userlog(void)
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */

diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c
index 94947ad03f22ca09eccff582d22b868d50b0e24e..e76f3e8d8d898b4ffc4f63cd948397fbe05bdcee 100644 (file)
--- a/epan/wslua/init_wslua.c
+++ b/epan/wslua/init_wslua.c
@@ -1004,10 +1004,10 @@ lua_State* wslua_state(void) { return L; }
  *
  * 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/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c
index 2b66cf0dcd1d4b189e9e7c5fc330b9ff537993cf..f05696074705ca911f8feff75338ab9b53a347fe 100644 (file)
--- a/epan/wslua/wslua_util.c
+++ b/epan/wslua/wslua_util.c
@@ -356,10 +356,10 @@ WSLUA_FUNCTION wslua_register_stat_cmd_arg(lua_State* L) {
  *
  * 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/extcap/extcap-base.h b/extcap/extcap-base.h
index 9da001a87ba27188ebfff4f3a0e926b850a3cc05..83500e449e83d41b95a3b2a54add1f870e11b5f7 100644 (file)
--- a/extcap/extcap-base.h
+++ b/extcap/extcap-base.h
@@ -76,12 +76,12 @@
 
 #define EXTCAP_BASE_OPTIONS \
        { "extcap-interfaces",          no_argument,            NULL, OPT_LIST_INTERFACES}, \
-       { "extcap-dlts",                        no_argument,            NULL, OPT_LIST_DLTS}, \
+       { "extcap-dlts",                no_argument,            NULL, OPT_LIST_DLTS}, \
        { "extcap-interface",           required_argument,      NULL, OPT_INTERFACE}, \
-       { "extcap-config",                      no_argument,            NULL, OPT_CONFIG}, \
-       { "capture",                            no_argument,            NULL, OPT_CAPTURE}, \
+       { "extcap-config",              no_argument,            NULL, OPT_CONFIG}, \
+       { "capture",                    no_argument,            NULL, OPT_CAPTURE}, \
        { "extcap-capture-filter",      required_argument,      NULL, OPT_CAPTURE_FILTER}, \
-       { "fifo",                                       required_argument,      NULL, OPT_FIFO} \
+       { "fifo",                       required_argument,      NULL, OPT_FIFO} \
 
 #endif
 
@@ -89,11 +89,11 @@
  * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */

diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index c31293e595eb5a4f53bc4287a8da70e5635d0b44..c808fbaf74ff8e489ed0ff9709da01e75f0f8b74 100644 (file)
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -445,11 +445,11 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 expandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */

diff --git a/extcap/sshdump.c b/extcap/sshdump.c
index 016d9d27b0fcc4fa6bce01697a4eb61f7c0e466d..c57de0bdd29bb27755f54872b0a6e47506a3973f 100644 (file)
--- a/extcap/sshdump.c
+++ b/extcap/sshdump.c
@@ -814,11 +814,11 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
  * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */

diff --git a/randpkt_core/randpkt_core.c b/randpkt_core/randpkt_core.c
index c3b977e95101d3919403e2b866db1e05cc9d80dc..21739b082a59ddc979af1cd5b49d3f6d0ea2ba5e 100644 (file)
--- a/randpkt_core/randpkt_core.c
+++ b/randpkt_core/randpkt_core.c
@@ -795,11 +795,11 @@ void randpkt_example_list(const char*** abbrev_list, const char*** longname_list
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */

diff --git a/randpkt_core/randpkt_core.h b/randpkt_core/randpkt_core.h
index 35265480cbb3249f3bf14e0289a5f8f5dea0f936..f7633fc0481d6c8116d63b9861b6fee4b30c98ce 100644 (file)
--- a/randpkt_core/randpkt_core.h
+++ b/randpkt_core/randpkt_core.h
@@ -74,11 +74,11 @@ gboolean randpkt_example_close(randpkt_example* example);
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */

diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c
index 18ddbbf6d60e7828b539337a84cef438bb25983e..d3fea45ce15bdc19175445b62294a9e5d4b932c3 100644 (file)
--- a/ui/gtk/lbm_stream_dlg.c
+++ b/ui/gtk/lbm_stream_dlg.c
@@ -766,10 +766,10 @@ void lbmc_stream_dlg_stream_menu_cb(gpointer arg _U_)
  *
  * 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/gtk/lbm_stream_dlg.h b/ui/gtk/lbm_stream_dlg.h
index b82f14967da104002fb55a7930852ce31b4781cc..ff6a9ce04ef213df1b67cf4df77c858028484cd0 100644 (file)
--- a/ui/gtk/lbm_stream_dlg.h
+++ b/ui/gtk/lbm_stream_dlg.h
@@ -36,10 +36,10 @@ void lbmc_stream_dlg_stream_menu_cb(gpointer arg);
  *
  * 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/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c
index 477c067e4c0cc1fa0e625f7e9ce2c95172eb56c3..b0993547b69b13bf43ac73da26cb76004ff73203 100644 (file)
--- a/ui/gtk/lbm_uimflow_dlg.c
+++ b/ui/gtk/lbm_uimflow_dlg.c
@@ -425,10 +425,10 @@ void lbmc_uim_flow_menu_cb(gpointer arg _U_)
  *
  * 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/gtk/lbm_uimflow_dlg.h b/ui/gtk/lbm_uimflow_dlg.h
index 991f8b437a2bc8509efc5d8422f463d4cb7a0b10..c7260d0f560d71e45d472ff9a8e4b581c3dd33cb 100644 (file)
--- a/ui/gtk/lbm_uimflow_dlg.h
+++ b/ui/gtk/lbm_uimflow_dlg.h
@@ -36,10 +36,10 @@ void lbmc_uim_flow_menu_cb(gpointer arg);
  *
  * 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.cpp b/ui/qt/compiled_filter_output.cpp
index 7ccdb869883cf3e8c4751752f348e0f173263b70..703857ed0804d1cde547859d542fa758e22c49aa 100644 (file)
--- 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 f2a3d90c3f46ba3ab2b510a043997bd67c9c2b70..44642a88e741d70bb922224d2394d9295392df63 100644 (file)
--- 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 283f2ab0f62e409b0498e63020997ee981979170..143611a9521ac4412476863b46e2dfc438758b5e 100644 (file)
--- 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 761a4f4ec9207549f98a5184a77e97c5e7df9404..6f84a92b213a257dc7198f6e293829c424fffbc4 100644 (file)
--- 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 8bf3553aa364bde168829180f879a94590ffb737..a2ff0118a54a22594eabfbf7bc9828cdbdf17854 100644 (file)
--- 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 a686e99f5a170ae45f85e28df20eb6101bc2ae65..bb0f75962e02317299aa441581928e9a471f7ef5 100644 (file)
--- 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 190ff5ae716d78d2ce183daea0bb68b9b17e6637..304c38c6bc10fe94ec94edff75d3deee42dcde57 100644 (file)
--- 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 48b2b7939656411d89b11575d30668f700bf157f..25d3ac64b6a02b0f71551dc4d3c0992d67300ff9 100644 (file)
--- 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 b687cfc9a5fe5b765e57080d53dcec0d2acb927b..f9970bedbecba2386437757e424fb5bb3e78daed 100644 (file)
--- 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 53abf26d4b313d84b142c808b14d281cbff11266..8310b0a28d121edb3fa53f8902f41781c768e415 100644 (file)
--- 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 f1b74517bed44395ea5dfe2bacbb864ad2d49322..b34c57b81ebc0d933c60c367fdc4fb7acb816140 100644 (file)
--- 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 0e68a8f33e32377bda27c580d2f01080dbbac53e..c77f126804778c2615b90c91514441af05702aed 100644 (file)
--- 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:
  */

diff --git a/wiretap/json.c b/wiretap/json.c
index e7cf2d68a805003be13c304e7da359c661fb61da..7f631cd95642db2babd50da6af8abce179b17740 100644 (file)
--- a/wiretap/json.c
+++ b/wiretap/json.c
@@ -140,7 +140,7 @@ wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *

diff --git a/wiretap/json.h b/wiretap/json.h
index 704e155eee2e7adce9c6372da508158dd9da26ac..0e792d9224e2bb4a255aae2ff1dcc5421933509a 100644 (file)
--- a/wiretap/json.h
+++ b/wiretap/json.h
@@ -46,7 +46,7 @@ wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info);
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *

diff --git a/wiretap/merge.c b/wiretap/merge.c
index f2e92e384a5cafadd7785ffd60a9b054d3105156..83ad2f35e6fe163d4e01e946d2b2e2d376276c84 100644 (file)
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -1077,10 +1077,10 @@ merge_files(int out_fd, const gchar* out_filename, const int file_type,
  *
  * 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/wsutil/jsmn.c b/wsutil/jsmn.c
index 79cf363fffe7efe92444ef1706b7bfa1352c44e6..4a505dbb944ef1be4b2cb35281a56fd01e1a7dca 100644 (file)
--- a/wsutil/jsmn.c
+++ b/wsutil/jsmn.c
@@ -385,11 +385,11 @@ gboolean jsmn_is_json(const guint8* buf, const size_t len)
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */

diff --git a/wsutil/jsmn.h b/wsutil/jsmn.h
index e4817dac5bb6502f05c962ec74394271b7e39fb9..7cf51aa81c943a6bb1b16dc4b7bd0cae3b9f3a0f 100644 (file)
--- a/wsutil/jsmn.h
+++ b/wsutil/jsmn.h
@@ -109,11 +109,11 @@ WS_DLL_PUBLIC gboolean jsmn_is_json(const guint8* buf, const size_t len);
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
- * c-basic-offset: 4
- * tab-width: 4
+ * c-basic-offset: 8
+ * tab-width: 8
  * indent-tabs-mode: t
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=8:noTabs=false:
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
  */