From b81ec75c8220e15e454424bc7a7cb15402936b05 Mon Sep 17 00:00:00 2001
From: June Tate-Gans <june@theonelab.com>
Date: Sun, 25 Apr 2021 21:12:26 -0500
Subject: [PATCH] g13d: More cleanups

Double underbars are reserved for the compiler and system, so we shouldn't use
them for header guards. Additionally, remove a bunch of these line breaks.
---
 g13d/g13.h      |  2 +-
 g13d/helper.h   | 14 +++-----------
 g13d/manager.h  |  2 --
 g13d/profile.cc |  1 -
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/g13d/g13.h b/g13d/g13.h
index 35c2cf0..1595b6e 100644
--- a/g13d/g13.h
+++ b/g13d/g13.h
@@ -55,4 +55,4 @@ class CommandException : public std::exception {
 
 }  // namespace G13
 
-#endif  // __G13_H__
+#endif  // G13_H
diff --git a/g13d/helper.h b/g13d/helper.h
index c76d3f5..c948ae5 100644
--- a/g13d/helper.h
+++ b/g13d/helper.h
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef __HELPER_HPP__
-#define __HELPER_HPP__
+#ifndef HELPER_HPP
+#define HELPER_HPP
 
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
@@ -44,12 +44,8 @@
 #include <string>
 #include <vector>
 
-// *************************************************************************
-
 namespace Helper {
 
-// *************************************************************************
-
 template <class MAP_T>
 struct _map_keys_out {
   _map_keys_out(const MAP_T &c, const std::string &s) : container(c), sep(s) {
@@ -79,10 +75,6 @@ _map_keys_out<MAP_T> map_keys_out(const MAP_T &c,
   return _map_keys_out<MAP_T>(c, sep);
 };
 
-// *************************************************************************
-
 };  // namespace Helper
 
-// *************************************************************************
-
-#endif  // __HELPER_HPP__
+#endif  // HELPER_HPP
diff --git a/g13d/manager.h b/g13d/manager.h
index 2be2510..f5dea10 100644
--- a/g13d/manager.h
+++ b/g13d/manager.h
@@ -60,8 +60,6 @@ class Manager {
   static void set_stop(int);
 };
 
-// *************************************************************************
-
 // inlines
 
 inline Manager &Action::manager() {
diff --git a/g13d/profile.cc b/g13d/profile.cc
index ad02798..b1143f4 100644
--- a/g13d/profile.cc
+++ b/g13d/profile.cc
@@ -13,7 +13,6 @@
 #include "repr.h"
 
 namespace G13 {
-// *************************************************************************
 
 void Key::dump(std::ostream &o) const {
   o << manager().find_g13_key_name(index()) << "(" << index() << ") : ";