[devhelp] Do not prefix macro names with underscores

From: Sébastien Wilmet <swilmet src gnome org>
To: commits-list gnome org
Cc:
Subject: [devhelp] Do not prefix macro names with underscores
Date: Fri, 28 Apr 2017 15:32:29 +0000 (UTC)
commit 81ab0ceeb976ab9696bcf6d4530448544ec60eb8
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Apr 28 17:14:34 2017 +0200

    Do not prefix macro names with underscores
    
    Symbols (even preprocessor macro names) that begin with an underscore
    are reserved for the use of the compiler, normally.

 src/devhelp.h                |    6 +++---
 src/dh-app.h                 |    6 +++---
 src/dh-assistant-view.h      |    6 +++---
 src/dh-assistant.h           |    6 +++---
 src/dh-book-manager.h        |    6 +++---
 src/dh-book-tree.h           |    6 +++---
 src/dh-enum-types.h.template |    6 +++---
 src/dh-error.h               |    6 +++---
 src/dh-keyword-model.h       |    6 +++---
 src/dh-language.h            |    6 +++---
 src/dh-link.h                |    6 +++---
 src/dh-parser.h              |    6 +++---
 src/dh-preferences.h         |    6 +++---
 src/dh-settings.h            |    6 +++---
 src/dh-sidebar.h             |    6 +++---
 src/dh-util.h                |    6 +++---
 src/dh-window.h              |    6 +++---
 17 files changed, 51 insertions(+), 51 deletions(-)
---
diff --git a/src/devhelp.h b/src/devhelp.h
index aa2192a..6fa165a 100644
--- a/src/devhelp.h
+++ b/src/devhelp.h
@@ -16,8 +16,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DEVHELP_H__
-#define __DEVHELP_H__
+#ifndef DEVHELP_H
+#define DEVHELP_H
 
 #include <glib.h>
 
@@ -40,4 +40,4 @@ void dh_init (void);
 
 G_END_DECLS
 
-#endif /* __DEVHELP_H__ */
+#endif /* DEVHELP_H */
diff --git a/src/dh-app.h b/src/dh-app.h
index bd7c88d..43b5174 100644
--- a/src/dh-app.h
+++ b/src/dh-app.h
@@ -16,8 +16,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_APP_H__
-#define __DH_APP_H__
+#ifndef DH_APP_H
+#define DH_APP_H
 
 #include <gtk/gtk.h>
 
@@ -63,4 +63,4 @@ gboolean      _dh_app_has_app_menu      (DhApp *app);
 
 G_END_DECLS
 
-#endif /* __DH_APP_H__ */
+#endif /* DH_APP_H */
diff --git a/src/dh-assistant-view.h b/src/dh-assistant-view.h
index aaa188e..46ef22a 100644
--- a/src/dh-assistant-view.h
+++ b/src/dh-assistant-view.h
@@ -18,8 +18,8 @@
  * USA
  */
 
-#ifndef __DH_ASSISTANT_VIEW_H__
-#define __DH_ASSISTANT_VIEW_H__
+#ifndef DH_ASSISTANT_VIEW_H
+#define DH_ASSISTANT_VIEW_H
 
 #include <webkit2/webkit2.h>
 #include "dh-book-manager.h"
@@ -55,4 +55,4 @@ gboolean   dh_assistant_view_set_link (DhAssistantView *view,
                                        DhLink          *link);
 G_END_DECLS
 
-#endif /* __DH_ASSISTANT_VIEW_H__ */
+#endif /* DH_ASSISTANT_VIEW_H */
diff --git a/src/dh-assistant.h b/src/dh-assistant.h
index dd0547d..44d19cd 100644
--- a/src/dh-assistant.h
+++ b/src/dh-assistant.h
@@ -16,8 +16,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_ASSISTANT_H__
-#define __DH_ASSISTANT_H__
+#ifndef DH_ASSISTANT_H
+#define DH_ASSISTANT_H
 
 #include <gtk/gtk.h>
 #include "dh-app.h"
@@ -49,4 +49,4 @@ gboolean   dh_assistant_search    (DhAssistant *assistant,
 
 G_END_DECLS
 
-#endif /* __DH_ASSISTANT_H__ */
+#endif /* DH_ASSISTANT_H */
diff --git a/src/dh-book-manager.h b/src/dh-book-manager.h
index 880a602..ba37ff3 100644
--- a/src/dh-book-manager.h
+++ b/src/dh-book-manager.h
@@ -16,8 +16,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_BOOK_MANAGER_H__
-#define __DH_BOOK_MANAGER_H__
+#ifndef DH_BOOK_MANAGER_H
+#define DH_BOOK_MANAGER_H
 
 #include <glib-object.h>
 
@@ -55,4 +55,4 @@ void           dh_book_manager_set_group_by_language (DhBookManager *book_manage
 
 G_END_DECLS
 
-#endif /* __DH_BOOK_MANAGER_H__ */
+#endif /* DH_BOOK_MANAGER_H */
diff --git a/src/dh-book-tree.h b/src/dh-book-tree.h
index e4cc4d2..f3aff40 100644
--- a/src/dh-book-tree.h
+++ b/src/dh-book-tree.h
@@ -16,8 +16,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_BOOK_TREE_H__
-#define __DH_BOOK_TREE_H__
+#ifndef DH_BOOK_TREE_H
+#define DH_BOOK_TREE_H
 
 #include <gtk/gtk.h>
 #include "dh-link.h"
@@ -50,4 +50,4 @@ DhLink      *dh_book_tree_get_selected_book (DhBookTree    *tree);
 
 G_END_DECLS
 
-#endif /* __DH_BOOK_TREE_H__ */
+#endif /* DH_BOOK_TREE_H */
diff --git a/src/dh-enum-types.h.template b/src/dh-enum-types.h.template
index fc97c74..40f6245 100644
--- a/src/dh-enum-types.h.template
+++ b/src/dh-enum-types.h.template
@@ -1,6 +1,6 @@
 /*** BEGIN file-header ***/
-#ifndef __DH_ENUM_TYPES_H__
-#define __DH_ENUM_TYPES_H__
+#ifndef DH_ENUM_TYPES_H
+#define DH_ENUM_TYPES_H
 
 #include <glib-object.h>
 
@@ -22,6 +22,6 @@ GType @enum_name@_get_type    (void) G_GNUC_CONST;
 /*** BEGIN file-tail ***/
 G_END_DECLS
 
-#endif /* __DH_ENUM_TYPES_H__ */
+#endif /* DH_ENUM_TYPES_H */
 /*** END file-tail ***/
 
diff --git a/src/dh-error.h b/src/dh-error.h
index b603b27..77b477f 100644
--- a/src/dh-error.h
+++ b/src/dh-error.h
@@ -17,8 +17,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_ERROR_H__
-#define __DH_ERROR_H__
+#ifndef DH_ERROR_H
+#define DH_ERROR_H
 
 #include <glib.h>
 
@@ -51,4 +51,4 @@ GQuark dh_error_quark (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __DH_ERROR_H__ */
+#endif /* DH_ERROR_H */
diff --git a/src/dh-keyword-model.h b/src/dh-keyword-model.h
index 07f1949..9edefcb 100644
--- a/src/dh-keyword-model.h
+++ b/src/dh-keyword-model.h
@@ -17,8 +17,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_KEYWORD_MODEL_H__
-#define __DH_KEYWORD_MODEL_H__
+#ifndef DH_KEYWORD_MODEL_H
+#define DH_KEYWORD_MODEL_H
 
 #include <glib-object.h>
 #include "dh-link.h"
@@ -64,4 +64,4 @@ DhLink *        dh_keyword_model_filter    (DhKeywordModel *model,
 
 G_END_DECLS
 
-#endif /* __DH_KEYWORD_MODEL_H__ */
+#endif /* DH_KEYWORD_MODEL_H */
diff --git a/src/dh-language.h b/src/dh-language.h
index af1f615..1818479 100644
--- a/src/dh-language.h
+++ b/src/dh-language.h
@@ -16,8 +16,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_LANGUAGE_H__
-#define __DH_LANGUAGE_H__
+#ifndef DH_LANGUAGE_H
+#define DH_LANGUAGE_H
 
 #include <glib-object.h>
 
@@ -56,4 +56,4 @@ gboolean     dh_language_dec_n_books_enabled (DhLanguage *language);
 
 G_END_DECLS
 
-#endif /* __DH_LANGUAGE_H__ */
+#endif /* DH_LANGUAGE_H */
diff --git a/src/dh-link.h b/src/dh-link.h
index b2806d8..a79191b 100644
--- a/src/dh-link.h
+++ b/src/dh-link.h
@@ -17,8 +17,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_LINK_H__
-#define __DH_LINK_H__
+#ifndef DH_LINK_H
+#define DH_LINK_H
 
 #include <glib-object.h>
 
@@ -89,4 +89,4 @@ void         dh_link_set_flags          (DhLink        *link,
 DhLinkType   dh_link_get_link_type      (DhLink        *link);
 const gchar *dh_link_get_type_as_string (DhLink        *link);
 
-#endif /* __DH_LINK_H__ */
+#endif /* DH_LINK_H */
diff --git a/src/dh-parser.h b/src/dh-parser.h
index bfab85f..34f8480 100644
--- a/src/dh-parser.h
+++ b/src/dh-parser.h
@@ -17,8 +17,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_PARSER_H__
-#define __DH_PARSER_H__
+#ifndef DH_PARSER_H
+#define DH_PARSER_H
 
 #include <glib.h>
 
@@ -34,4 +34,4 @@ gboolean dh_parser_read_file (const gchar  *path,
 
 G_END_DECLS
 
-#endif /* __DH_PARSER_H__ */
+#endif /* DH_PARSER_H */
diff --git a/src/dh-preferences.h b/src/dh-preferences.h
index 5517940..5bb7554 100644
--- a/src/dh-preferences.h
+++ b/src/dh-preferences.h
@@ -17,8 +17,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_PREFERENCES_H__
-#define __DH_PREFERENCES_H__
+#ifndef DH_PREFERENCES_H
+#define DH_PREFERENCES_H
 
 #include <gtk/gtk.h>
 
@@ -51,4 +51,4 @@ void dh_preferences_show_dialog (GtkWindow *parent);
 
 G_END_DECLS
 
-#endif /* __DH_PREFERENCES_H__ */
+#endif /* DH_PREFERENCES_H */
diff --git a/src/dh-settings.h b/src/dh-settings.h
index 92a488d..1a12b90 100644
--- a/src/dh-settings.h
+++ b/src/dh-settings.h
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_SETTINGS_H__
-#define __DH_SETTINGS_H__
+#ifndef DH_SETTINGS_H
+#define DH_SETTINGS_H
 
 #include <gio/gio.h>
 
@@ -71,4 +71,4 @@ void            dh_settings_get_selected_fonts          (DhSettings  *self,
 
 G_END_DECLS
 
-#endif /* __DH_SETTINGS_H__ */
+#endif /* DH_SETTINGS_H */
diff --git a/src/dh-sidebar.h b/src/dh-sidebar.h
index e52706b..550bb0d 100644
--- a/src/dh-sidebar.h
+++ b/src/dh-sidebar.h
@@ -18,8 +18,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_SIDEBAR_H__
-#define __DH_SIDEBAR_H__
+#ifndef DH_SIDEBAR_H
+#define DH_SIDEBAR_H
 
 #include <gtk/gtk.h>
 #include "dh-link.h"
@@ -65,4 +65,4 @@ void       dh_sidebar_set_search_focus  (DhSidebar   *sidebar);
 
 G_END_DECLS
 
-#endif /* __DH_SIDEBAR_H__ */
+#endif /* DH_SIDEBAR_H */
diff --git a/src/dh-util.h b/src/dh-util.h
index 1df418c..ee3c81a 100644
--- a/src/dh-util.h
+++ b/src/dh-util.h
@@ -17,8 +17,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_UTIL_H__
-#define __DH_UTIL_H__
+#ifndef DH_UTIL_H
+#define DH_UTIL_H
 
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
@@ -51,4 +51,4 @@ void         dh_util_queue_concat                 (GQueue *q1,
 
 G_END_DECLS
 
-#endif /* __DH_UTIL_H__ */
+#endif /* DH_UTIL_H */
diff --git a/src/dh-window.h b/src/dh-window.h
index 13aeffc..a0abdec 100644
--- a/src/dh-window.h
+++ b/src/dh-window.h
@@ -18,8 +18,8 @@
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DH_WINDOW_H__
-#define __DH_WINDOW_H__
+#ifndef DH_WINDOW_H
+#define DH_WINDOW_H
 
 #include <gtk/gtk.h>
 #include "dh-app.h"
@@ -74,4 +74,4 @@ void       _dh_window_display_uri (DhWindow    *window,
 
 G_END_DECLS
 
-#endif /* __DH_WINDOW_H__ */
+#endif /* DH_WINDOW_H */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]