diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-08-11 08:58:13 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-08-11 11:28:10 +0000 |
commit | aaeedcb108aba98059269c439688774f951b3f26 (patch) | |
tree | 9d3c2102dd0f4a9e9000f2bc9dc56668e3a5c753 | |
parent | a2090cd205edbcbb88079f891a1a70a6bd317f31 (diff) |
Fix modeline (use Wireshark standard with C comment and no C++ comment)
Fix also some indent (tab->4spaces)
Change-Id: Ieef26591d405c6abe622f9fa26d2a7117af3c259
Reviewed-on: https://code.wireshark.org/review/3548
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | ui/qt/manage_interfaces_dialog.cpp | 25 | ||||
-rw-r--r-- | ui/qt/manage_interfaces_dialog.h | 24 | ||||
-rw-r--r-- | ui/qt/remote_capture_dialog.cpp | 29 | ||||
-rw-r--r-- | ui/qt/remote_capture_dialog.h | 24 | ||||
-rw-r--r-- | ui/qt/remote_settings_dialog.cpp | 24 | ||||
-rw-r--r-- | ui/qt/remote_settings_dialog.h | 24 |
6 files changed, 76 insertions, 74 deletions
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index d5f8038c51..5d351c1317 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -743,15 +743,16 @@ void NewFileDelegate::browse_button_clicked() } #endif /* HAVE_LIBPCAP */ -// -// Editor modelines - http://www.wireshark.org/tools/modelines.html -// -// Local variables: -// c-basic-offset: 4 -// tab-width: 4 -// indent-tabs-mode: nil -// End: -// -// vi: set shiftwidth=4 tabstop=4 expandtab: -// :indentSize=4:tabSize=4:noTabs=true: -// + +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h index 195cad6569..615fd12d58 100644 --- a/ui/qt/manage_interfaces_dialog.h +++ b/ui/qt/manage_interfaces_dialog.h @@ -120,15 +120,15 @@ private slots: #endif // MANAGE_INTERFACES_DIALOG_H -// -// Editor modelines - http://www.wireshark.org/tools/modelines.html -// -// Local variables: -// c-basic-offset: 4 -// tab-width: 4 -// indent-tabs-mode: nil -// End: -// -// vi: set shiftwidth=4 tabstop=4 expandtab: -// :indentSize=4:tabSize=4:noTabs=true: -// +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/qt/remote_capture_dialog.cpp b/ui/qt/remote_capture_dialog.cpp index e52e5973f0..38c53d2dbb 100644 --- a/ui/qt/remote_capture_dialog.cpp +++ b/ui/qt/remote_capture_dialog.cpp @@ -95,9 +95,9 @@ void RemoteCaptureDialog::fillComboBox() void RemoteCaptureDialog::apply_remote() { - int err; + int err; gchar *err_str; - remote_options global_remote_opts; + remote_options global_remote_opts; QString host = ui->hostCombo->currentText(); global_remote_opts.src_type = CAPTURE_IFREMOTE; @@ -166,15 +166,16 @@ void RemoteCaptureDialog::on_nullAuth_toggled(bool checked) } } #endif /* HAVE_PCAP_REMOTE */ -// -// Editor modelines - http://www.wireshark.org/tools/modelines.html -// -// Local variables: -// c-basic-offset: 4 -// tab-width: 4 -// indent-tabs-mode: nil -// End: -// -// vi: set shiftwidth=4 tabstop=4 expandtab: -// :indentSize=4:tabSize=4:noTabs=true: -// + +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/qt/remote_capture_dialog.h b/ui/qt/remote_capture_dialog.h index 563ee2e997..0534053748 100644 --- a/ui/qt/remote_capture_dialog.h +++ b/ui/qt/remote_capture_dialog.h @@ -59,15 +59,15 @@ private: #endif #endif // REMOTE_CAPTURE_DIALOG_H -// -// Editor modelines - http://www.wireshark.org/tools/modelines.html -// -// Local variables: -// c-basic-offset: 4 -// tab-width: 4 -// indent-tabs-mode: nil -// End: -// -// vi: set shiftwidth=4 tabstop=4 expandtab: -// :indentSize=4:tabSize=4:noTabs=true: -// +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/qt/remote_settings_dialog.cpp b/ui/qt/remote_settings_dialog.cpp index 66fc49579b..c677df3704 100644 --- a/ui/qt/remote_settings_dialog.cpp +++ b/ui/qt/remote_settings_dialog.cpp @@ -86,15 +86,15 @@ void RemoteSettingsDialog::on_buttonBox_accepted() } #endif -// -// Editor modelines - http://www.wireshark.org/tools/modelines.html -// -// Local variables: -// c-basic-offset: 4 -// tab-width: 4 -// indent-tabs-mode: nil -// End: -// -// vi: set shiftwidth=4 tabstop=4 expandtab: -// :indentSize=4:tabSize=4:noTabs=true: -// +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/qt/remote_settings_dialog.h b/ui/qt/remote_settings_dialog.h index a8e7b71bd9..e5dfd70417 100644 --- a/ui/qt/remote_settings_dialog.h +++ b/ui/qt/remote_settings_dialog.h @@ -53,15 +53,15 @@ private: #endif #endif // REMOTE_SETTINGS_DIALOG_H -// -// Editor modelines - http://www.wireshark.org/tools/modelines.html -// -// Local variables: -// c-basic-offset: 4 -// tab-width: 4 -// indent-tabs-mode: nil -// End: -// -// vi: set shiftwidth=4 tabstop=4 expandtab: -// :indentSize=4:tabSize=4:noTabs=true: -// +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ |