aboutsummaryrefslogtreecommitdiffstats
path: root/ui/preference_utils.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-11-28 16:03:11 -0800
committerMichael Mann <mmann78@netscape.net>2017-11-30 00:14:16 +0000
commit3ed5b4fb67edc6829ece7adf542f44e9a75185af (patch)
tree24ad6cc6525ca7af094d8c6d04dccf26d272227d /ui/preference_utils.h
parentb59dc97dfef3bcce71cd393f4d2493e7ba1a8f82 (diff)
Reformat some top-level ui files.
Make sure each ui/*.[ch] file uses identical (4-space) indentation. Remove ui/.editorconfig. Fix up other formatting where needed. SPDX-abbreviate the license blurb in the files we modify. Change-Id: I5faa1c1eae9a4b6220422ad8e4ba7a341c7deb1f Reviewed-on: https://code.wireshark.org/review/24632 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/preference_utils.h')
-rw-r--r--ui/preference_utils.h22
1 files changed, 5 insertions, 17 deletions
diff --git a/ui/preference_utils.h b/ui/preference_utils.h
index 4cfa3df4f7..aafbc1b1a2 100644
--- a/ui/preference_utils.h
+++ b/ui/preference_utils.h
@@ -5,19 +5,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PREFRENCE_UTILS_H__
@@ -103,14 +91,14 @@ void column_prefs_remove_nth(gint col);
#endif /* __PREFRENCE_UTILS_H__ */
/*
- * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ * Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local Variables:
- * c-basic-offset: 2
+ * c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
- * vi: set shiftwidth=2 tabstop=8 expandtab:
- * :indentSize=2:tabSize=8:noTabs=true:
+ * ex: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
*/