From 2ec95528c4a7157ba430bda0ebcb223365c471bc Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Tue, 11 Oct 2022 21:11:05 +0100
Subject: [PATCH] Update header style
Based on Adwaita's one
---
src/rugby-app-window.c | 5 +++--
src/rugby-app-window.h | 2 +-
src/rugby-list-store.h | 8 +++++---
src/rugby-possibility-widget.c | 7 ++++---
src/rugby-possibility-widget.h | 2 --
src/rugby-possibility.h | 9 +++++----
src/rugby-pref-window.h | 3 +--
7 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/rugby-app-window.c b/src/rugby-app-window.c
index 27bbbbb..a1bf283 100644
--- a/src/rugby-app-window.c
+++ b/src/rugby-app-window.c
@@ -4,10 +4,11 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#include <config.h>
-
+#include "config.h"
#include "rugby-app-window.h"
+
#include "rugby-list-store.h"
+#include "rugby-possibility.h"
#include "rugby-possibility-widget.h"
#include <glib/gi18n.h>
diff --git a/src/rugby-app-window.h b/src/rugby-app-window.h
index 1f3fb8d..816bee0 100644
--- a/src/rugby-app-window.h
+++ b/src/rugby-app-window.h
@@ -14,6 +14,6 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (RugbyAppWindow, rugby_app_window, RUGBY, APP_WINDOW, AdwApplicationWindow)
-RugbyAppWindow * rugby_app_window_new (GtkApplication *app);
+RugbyAppWindow *rugby_app_window_new (GtkApplication *app);
G_END_DECLS
diff --git a/src/rugby-list-store.h b/src/rugby-list-store.h
index fb7de95..e4b6c5e 100644
--- a/src/rugby-list-store.h
+++ b/src/rugby-list-store.h
@@ -1,5 +1,6 @@
/*
* SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk>
+ *
* SPDX-License-Identifier: GPL-3.0-or-later
*/
@@ -10,10 +11,11 @@
G_BEGIN_DECLS
#define RUGBY_TYPE_LIST_STORE (rugby_list_store_get_type())
+
G_DECLARE_FINAL_TYPE (RugbyListStore, rugby_list_store, RUGBY, LIST_STORE, GObject)
-int rugby_list_store_get_score (RugbyListStore *self);
-void rugby_list_store_set_score (RugbyListStore *self,
- int score);
+int rugby_list_store_get_score (RugbyListStore *self);
+void rugby_list_store_set_score (RugbyListStore *self,
+ int score);
G_END_DECLS
diff --git a/src/rugby-possibility-widget.c b/src/rugby-possibility-widget.c
index ca6255a..bd1f821 100644
--- a/src/rugby-possibility-widget.c
+++ b/src/rugby-possibility-widget.c
@@ -4,11 +4,12 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#include <config.h>
+#include "config.h"
+#include "rugby-possibility-widget.h"
-#include <adwaita.h>
+#include "rugby-possibility.h"
-#include "rugby-possibility-widget.h"
+#include <adwaita.h>
struct _RugbyPossibilityWidget
{
diff --git a/src/rugby-possibility-widget.h b/src/rugby-possibility-widget.h
index e9b8a46..677e278 100644
--- a/src/rugby-possibility-widget.h
+++ b/src/rugby-possibility-widget.h
@@ -8,8 +8,6 @@
#include <gtk/gtk.h>
-#include "rugby-possibility.h"
-
G_BEGIN_DECLS
#define RUGBY_TYPE_POSSIBILITY_WIDGET (rugby_possibility_widget_get_type())
diff --git a/src/rugby-possibility.h b/src/rugby-possibility.h
index d21dedb..dd7fe74 100644
--- a/src/rugby-possibility.h
+++ b/src/rugby-possibility.h
@@ -1,5 +1,6 @@
/*
- * SPDX-FileCopyrightText: 2018 Bruce Cowan <bruce@bcowan.me.uk>
+ * SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk>
+ *
* SPDX-License-Identifier: GPL-3.0-or-later
*/
@@ -13,8 +14,8 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (RugbyPossibility, rugby_possibility, RUGBY, POSSIBILITY, GObject)
-RugbyPossibility * rugby_possibility_new (int tries,
- int utries,
- int kicks);
+RugbyPossibility *rugby_possibility_new (int tries,
+ int utries,
+ int kicks);
G_END_DECLS
diff --git a/src/rugby-pref-window.h b/src/rugby-pref-window.h
index 9a02e00..555b890 100644
--- a/src/rugby-pref-window.h
+++ b/src/rugby-pref-window.h
@@ -1,5 +1,5 @@
/*
- * SPDX-FileCopyrightText: 2020-2021 Bruce Cowan <bruce@bcowan.me.uk>
+ * SPDX-FileCopyrightText: 2020-2022 Bruce Cowan <bruce@bcowan.me.uk>
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
@@ -8,7 +8,6 @@
#include "rugby-app-window.h"
-#include <gtk/gtk.h>
#include <adwaita.h>
G_BEGIN_DECLS
--
GitLab