[gnome-todo] Rename GtdTimer to GtdClock

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit e79dac42d8228e0928fee62022550845ef3d928e
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sat Mar 30 19:09:21 2019 -0300

    Rename GtdTimer to GtdClock

 plugins/all-tasks-panel/gtd-all-tasks-panel.c |  6 ++--
 plugins/background/gtd-plugin-background.c    |  4 +--
 plugins/next-week-panel/gtd-next-week-panel.c |  6 ++--
 plugins/scheduled-panel/gtd-panel-scheduled.c |  6 ++--
 plugins/today-panel/gtd-panel-today.c         |  6 ++--
 src/engine/gtd-manager.c                      | 43 +++++++++++-----------
 src/engine/gtd-manager.h                      |  2 +-
 src/{gtd-timer.c => gtd-clock.c}              | 52 +++++++++++++--------------
 src/{gtd-timer.h => gtd-clock.h}              | 14 +++-----
 src/gtd-types.h                               |  2 +-
 src/meson.build                               |  8 ++---
 11 files changed, 72 insertions(+), 77 deletions(-)
---
diff --git a/plugins/all-tasks-panel/gtd-all-tasks-panel.c b/plugins/all-tasks-panel/gtd-all-tasks-panel.c
index 2fc100b..1fa6b60 100644
--- a/plugins/all-tasks-panel/gtd-all-tasks-panel.c
+++ b/plugins/all-tasks-panel/gtd-all-tasks-panel.c
@@ -270,7 +270,7 @@ on_model_items_changed_cb (GListModel       *model,
 }
 
 static void
-on_timer_updated_cb (GtdTimer         *timer,
+on_clock_updated_cb (GtdClock         *clock,
                      GtdAllTasksPanel *self)
 {
   g_autoptr (GDateTime) now = NULL;
@@ -454,9 +454,9 @@ gtd_all_tasks_panel_init (GtdAllTasksPanel *self)
                            self,
                            0);
 
-  g_signal_connect_object (gtd_manager_get_timer (manager),
+  g_signal_connect_object (gtd_manager_get_clock (manager),
                            "update",
-                           G_CALLBACK (on_timer_updated_cb),
+                           G_CALLBACK (on_clock_updated_cb),
                            self,
                            G_CONNECT_SWAPPED);
 }
diff --git a/plugins/background/gtd-plugin-background.c b/plugins/background/gtd-plugin-background.c
index cbfc3f8..c58912f 100644
--- a/plugins/background/gtd-plugin-background.c
+++ b/plugins/background/gtd-plugin-background.c
@@ -329,7 +329,7 @@ watch_manager_for_new_lists (GtdPluginBackground *self)
                             G_CALLBACK (on_tasklist_notified),
                             self);
 
-  g_signal_connect_swapped (gtd_manager_get_timer (manager),
+  g_signal_connect_swapped (gtd_manager_get_clock (manager),
                             "update",
                             G_CALLBACK (send_notification),
                             self);
@@ -380,7 +380,7 @@ gtd_plugin_background_deactivate (GtdActivatable *activatable)
                                         on_tasklist_notified,
                                         self);
 
-  g_signal_handlers_disconnect_by_func (gtd_manager_get_timer (manager),
+  g_signal_handlers_disconnect_by_func (gtd_manager_get_clock (manager),
                                         send_notification,
                                         self);
 
diff --git a/plugins/next-week-panel/gtd-next-week-panel.c b/plugins/next-week-panel/gtd-next-week-panel.c
index f8e5a9a..29c0400 100644
--- a/plugins/next-week-panel/gtd-next-week-panel.c
+++ b/plugins/next-week-panel/gtd-next-week-panel.c
@@ -318,7 +318,7 @@ on_model_items_changed_cb (GListModel       *model,
 }
 
 static void
-on_timer_updated_cb (GtdTimer         *timer,
+on_clock_updated_cb (GtdClock         *clock,
                      GtdNextWeekPanel *self)
 {
   g_autoptr (GDateTime) now = NULL;
@@ -504,9 +504,9 @@ gtd_next_week_panel_init (GtdNextWeekPanel *self)
                            self,
                            0);
 
-  g_signal_connect_object (gtd_manager_get_timer (manager),
+  g_signal_connect_object (gtd_manager_get_clock (manager),
                            "update",
-                           G_CALLBACK (on_timer_updated_cb),
+                           G_CALLBACK (on_clock_updated_cb),
                            self,
                            G_CONNECT_SWAPPED);
 }
diff --git a/plugins/scheduled-panel/gtd-panel-scheduled.c b/plugins/scheduled-panel/gtd-panel-scheduled.c
index 9ec4f0f..804f670 100644
--- a/plugins/scheduled-panel/gtd-panel-scheduled.c
+++ b/plugins/scheduled-panel/gtd-panel-scheduled.c
@@ -316,7 +316,7 @@ on_model_items_changed_cb (GListModel        *model,
 }
 
 static void
-on_timer_updated_cb (GtdTimer          *timer,
+on_clock_updated_cb (GtdClock          *clock,
                      GtdPanelScheduled *self)
 {
   g_autoptr (GDateTime) now = NULL;
@@ -497,9 +497,9 @@ gtd_panel_scheduled_init (GtdPanelScheduled *self)
                            self,
                            0);
 
-  g_signal_connect_object (gtd_manager_get_timer (manager),
+  g_signal_connect_object (gtd_manager_get_clock (manager),
                            "update",
-                           G_CALLBACK (on_timer_updated_cb),
+                           G_CALLBACK (on_clock_updated_cb),
                            self,
                            G_CONNECT_SWAPPED);
 }
diff --git a/plugins/today-panel/gtd-panel-today.c b/plugins/today-panel/gtd-panel-today.c
index 8e6e939..a677faa 100644
--- a/plugins/today-panel/gtd-panel-today.c
+++ b/plugins/today-panel/gtd-panel-today.c
@@ -230,7 +230,7 @@ on_model_items_changed_cb (GListModel    *model,
 }
 
 static void
-on_timer_updated_cb (GtdTimer      *timer,
+on_clock_updated_cb (GtdClock      *clock,
                      GtdPanelToday *self)
 {
   g_autoptr (GDateTime) now = NULL;
@@ -416,9 +416,9 @@ gtd_panel_today_init (GtdPanelToday *self)
                            self,
                            0);
 
-  g_signal_connect_object (gtd_manager_get_timer (manager),
+  g_signal_connect_object (gtd_manager_get_clock (manager),
                            "update",
-                           G_CALLBACK (on_timer_updated_cb),
+                           G_CALLBACK (on_clock_updated_cb),
                            self,
                            G_CONNECT_SWAPPED);
 }
diff --git a/src/engine/gtd-manager.c b/src/engine/gtd-manager.c
index da387c8..021821d 100644
--- a/src/engine/gtd-manager.c
+++ b/src/engine/gtd-manager.c
@@ -23,13 +23,13 @@
 #include "interfaces/gtd-provider.h"
 #include "interfaces/gtd-panel.h"
 #include "notification/gtd-notification.h"
+#include "gtd-clock.h"
 #include "gtd-debug.h"
 #include "gtd-manager.h"
 #include "gtd-manager-protected.h"
 #include "gtd-plugin-manager.h"
 #include "gtd-task.h"
 #include "gtd-task-list.h"
-#include "gtd-timer.h"
 #include "gtd-utils.h"
 
 #include <glib/gi18n.h>
@@ -62,7 +62,7 @@ struct _GtdManager
   GList              *providers;
   GList              *panels;
   GtdProvider        *default_provider;
-  GtdTimer           *timer;
+  GtdClock           *clock;
 
   GCancellable       *cancellable;
 };
@@ -91,7 +91,7 @@ enum
   PROP_0,
   PROP_DEFAULT_PROVIDER,
   PROP_DEFAULT_TASKLIST,
-  PROP_TIMER,
+  PROP_CLOCK,
   PROP_PLUGIN_MANAGER,
   LAST_PROP
 };
@@ -304,7 +304,7 @@ gtd_manager_finalize (GObject *object)
   g_clear_object (&self->cancellable);
   g_clear_object (&self->plugin_manager);
   g_clear_object (&self->settings);
-  g_clear_object (&self->timer);
+  g_clear_object (&self->clock);
   g_clear_object (&self->lists_model);
 
   G_OBJECT_CLASS (gtd_manager_parent_class)->finalize (object);
@@ -328,8 +328,8 @@ gtd_manager_get_property (GObject    *object,
       g_value_set_object (value, gtd_provider_get_default_task_list (self->default_provider));
       break;
 
-    case PROP_TIMER:
-      g_value_set_object (value, self->timer);
+    case PROP_CLOCK:
+      g_value_set_object (value, self->clock);
       break;
 
     case PROP_PLUGIN_MANAGER:
@@ -403,17 +403,17 @@ gtd_manager_class_init (GtdManagerClass *klass)
                              G_PARAM_READWRITE));
 
   /**
-   * GtdManager::timer:
+   * GtdManager::clock:
    *
-   * The underlying timer of GNOME To DO.
+   * The underlying clock of GNOME To Do.
    */
   g_object_class_install_property (
         object_class,
-        PROP_TIMER,
-        g_param_spec_object ("timer",
-                             "The timer",
-                             "The timer of the application",
-                             GTD_TYPE_TIMER,
+        PROP_CLOCK,
+        g_param_spec_object ("clock",
+                             "The clock",
+                             "The clock of the application",
+                             GTD_TYPE_CLOCK,
                              G_PARAM_READABLE));
 
   /**
@@ -613,7 +613,7 @@ gtd_manager_init (GtdManager *self)
 {
   self->settings = g_settings_new ("org.gnome.todo");
   self->plugin_manager = gtd_plugin_manager_new ();
-  self->timer = gtd_timer_new ();
+  self->clock = gtd_clock_new ();
   self->cancellable = g_cancellable_new ();
   self->lists_model = (GListModel*) gtd_list_store_new (GTD_TYPE_TASK_LIST);
   self->tasks_model = (GListModel*) _gtd_task_model_new (self);
@@ -876,21 +876,20 @@ gtd_manager_send_notification (GtdManager      *self,
 }
 
 /**
- * gtd_manager_get_timer:
+ * gtd_manager_get_clock:
  * @self: a #GtdManager
  *
- * Retrieves the #GtdTimer from @self. You can use the
- * timer to know when your code should be updated.
+ * Retrieves the #GtdClock from @self. You can use the
+ * clock to know when your code should be updated.
  *
- * Returns: (transfer none): a #GtdTimer
+ * Returns: (transfer none): a #GtdClock
  */
-GtdTimer*
-gtd_manager_get_timer (GtdManager *self)
+GtdClock*
+gtd_manager_get_clock (GtdManager *self)
 {
-
   g_return_val_if_fail (GTD_IS_MANAGER (self), NULL);
 
-  return self->timer;
+  return self->clock;
 }
 
 /**
diff --git a/src/engine/gtd-manager.h b/src/engine/gtd-manager.h
index ccba2ac..c8661b3 100644
--- a/src/engine/gtd-manager.h
+++ b/src/engine/gtd-manager.h
@@ -70,7 +70,7 @@ void                 gtd_manager_emit_error_message              (GtdManager
 void                 gtd_manager_send_notification               (GtdManager         *self,
                                                                   GtdNotification    *notification);
 
-GtdTimer*            gtd_manager_get_timer                       (GtdManager         *self);
+GtdClock*            gtd_manager_get_clock                       (GtdManager         *self);
 
 GListModel*          gtd_manager_get_task_lists_model            (GtdManager         *self);
 
diff --git a/src/gtd-timer.c b/src/gtd-clock.c
similarity index 85%
rename from src/gtd-timer.c
rename to src/gtd-clock.c
index e027af2..536245b 100644
--- a/src/gtd-timer.c
+++ b/src/gtd-clock.c
@@ -1,4 +1,4 @@
-/* gtd-timer.c
+/* gtd-clock.c
  *
  * Copyright (C) 2017 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define G_LOG_DOMAIN "GtdTimer"
+#define G_LOG_DOMAIN "GtdClock"
 
-#include "gtd-timer.h"
+#include "gtd-clock.h"
 
 #include <gio/gio.h>
 
-struct _GtdTimer
+struct _GtdClock
 {
   GtdObject           parent;
 
@@ -36,7 +36,7 @@ struct _GtdTimer
 
 static gboolean      update_for_day_change                       (gpointer           user_data);
 
-G_DEFINE_TYPE (GtdTimer, gtd_timer, GTD_TYPE_OBJECT)
+G_DEFINE_TYPE (GtdClock, gtd_clock, GTD_TYPE_OBJECT)
 
 enum
 {
@@ -51,7 +51,7 @@ static guint signals[N_SIGNALS] = { 0, };
  */
 
 static void
-update_current_day (GtdTimer *self)
+update_current_day (GtdClock *self)
 {
   g_autoptr (GDateTime) now = NULL;
 
@@ -69,7 +69,7 @@ update_current_day (GtdTimer *self)
 }
 
 static void
-schedule_update_for_day_change (GtdTimer *self)
+schedule_update_for_day_change (GtdClock *self)
 {
   g_autoptr (GDateTime) now;
   guint seconds_between;
@@ -101,7 +101,7 @@ logind_signal_received_cb (GDBusProxy  *logind,
                            const gchar *sender,
                            const gchar *signal,
                            GVariant    *params,
-                           GtdTimer    *self)
+                           GtdClock    *self)
 {
   GVariant *child;
   gboolean resuming;
@@ -129,9 +129,9 @@ login_proxy_acquired_cb (GObject      *source,
                          gpointer      user_data)
 {
   g_autoptr (GError) error = NULL;
-  GtdTimer *self;
+  GtdClock *self;
 
-  self = GTD_TIMER (user_data);
+  self = GTD_CLOCK (user_data);
 
   gtd_object_pop_loading (GTD_OBJECT (self));
 
@@ -152,7 +152,7 @@ login_proxy_acquired_cb (GObject      *source,
 static gboolean
 update_for_day_change (gpointer user_data)
 {
-  GtdTimer *self = user_data;
+  GtdClock *self = user_data;
 
   /* Remove it first */
   self->update_timeout_id = 0;
@@ -171,9 +171,9 @@ update_for_day_change (gpointer user_data)
  * GObject overrides
  */
 static void
-gtd_timer_finalize (GObject *object)
+gtd_clock_finalize (GObject *object)
 {
-  GtdTimer *self = (GtdTimer *)object;
+  GtdClock *self = (GtdClock *)object;
 
   g_cancellable_cancel (self->cancellable);
 
@@ -188,11 +188,11 @@ gtd_timer_finalize (GObject *object)
   g_clear_object (&self->cancellable);
   g_clear_object (&self->logind);
 
-  G_OBJECT_CLASS (gtd_timer_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtd_clock_parent_class)->finalize (object);
 }
 
 static void
-gtd_timer_get_property (GObject    *object,
+gtd_clock_get_property (GObject    *object,
                         guint       prop_id,
                         GValue     *value,
                         GParamSpec *pspec)
@@ -201,7 +201,7 @@ gtd_timer_get_property (GObject    *object,
 }
 
 static void
-gtd_timer_set_property (GObject      *object,
+gtd_clock_set_property (GObject      *object,
                         guint         prop_id,
                         const GValue *value,
                         GParamSpec   *pspec)
@@ -210,22 +210,22 @@ gtd_timer_set_property (GObject      *object,
 }
 
 static void
-gtd_timer_class_init (GtdTimerClass *klass)
+gtd_clock_class_init (GtdClockClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = gtd_timer_finalize;
-  object_class->get_property = gtd_timer_get_property;
-  object_class->set_property = gtd_timer_set_property;
+  object_class->finalize = gtd_clock_finalize;
+  object_class->get_property = gtd_clock_get_property;
+  object_class->set_property = gtd_clock_set_property;
 
   /**
-   * GtdTimer:update:
+   * GtdClock:update:
    *
    * Emited when an update is required. This is emited usually
    * after a session resume, or a day change.
    */
   signals[UPDATE] = g_signal_new ("update",
-                                  GTD_TYPE_TIMER,
+                                  GTD_TYPE_CLOCK,
                                   G_SIGNAL_RUN_LAST,
                                   0, NULL, NULL, NULL,
                                   G_TYPE_NONE,
@@ -233,7 +233,7 @@ gtd_timer_class_init (GtdTimerClass *klass)
 }
 
 static void
-gtd_timer_init (GtdTimer *self)
+gtd_clock_init (GtdClock *self)
 {
   gtd_object_push_loading (GTD_OBJECT (self));
 
@@ -253,8 +253,8 @@ gtd_timer_init (GtdTimer *self)
   schedule_update_for_day_change (self);
 }
 
-GtdTimer*
-gtd_timer_new (void)
+GtdClock*
+gtd_clock_new (void)
 {
-  return g_object_new (GTD_TYPE_TIMER, NULL);
+  return g_object_new (GTD_TYPE_CLOCK, NULL);
 }
diff --git a/src/gtd-timer.h b/src/gtd-clock.h
similarity index 76%
rename from src/gtd-timer.h
rename to src/gtd-clock.h
index 2eea02b..ab09b0b 100644
--- a/src/gtd-timer.h
+++ b/src/gtd-clock.h
@@ -1,4 +1,4 @@
-/* gtd-timer.h
+/* gtd-clock.h
  *
  * Copyright (C) 2017 Georges Basile Stavracas Neto <georges stavracas gmail com>
  *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GTD_TIMER_H
-#define GTD_TIMER_H
+#pragma once
 
 #include "gtd-object.h"
 
@@ -25,13 +24,10 @@
 
 G_BEGIN_DECLS
 
-#define GTD_TYPE_TIMER (gtd_timer_get_type())
+#define GTD_TYPE_CLOCK (gtd_clock_get_type())
 
-G_DECLARE_FINAL_TYPE (GtdTimer, gtd_timer, GTD, TIMER, GtdObject)
+G_DECLARE_FINAL_TYPE (GtdClock, gtd_clock, GTD, CLOCK, GtdObject)
 
-GtdTimer*            gtd_timer_new                               (void);
+GtdClock*            gtd_clock_new                               (void);
 
 G_END_DECLS
-
-#endif /* GTD_TIMER_H */
-
diff --git a/src/gtd-types.h b/src/gtd-types.h
index ca2addd..9d91b5e 100644
--- a/src/gtd-types.h
+++ b/src/gtd-types.h
@@ -27,6 +27,7 @@ G_BEGIN_DECLS
 
 typedef struct _GtdActivatable          GtdActivatable;
 typedef struct _GtdApplication          GtdApplication;
+typedef struct _GtdClock                GtdClock;
 typedef struct _GtdDoneButton           GtdDoneButton;
 typedef struct _GtdInitialSetupWindow   GtdInitialSetupWindow;
 typedef struct _GtdListView             GtdListView;
@@ -46,7 +47,6 @@ typedef struct _GtdTask                 GtdTask;
 typedef struct _GtdTaskList             GtdTaskList;
 typedef struct _GtdTaskListItem         GtdTaskListItem;
 typedef struct _GtdTaskRow              GtdTaskRow;
-typedef struct _GtdTimer                GtdTimer;
 typedef struct _GtdWindow               GtdWindow;
 
 G_END_DECLS
diff --git a/src/meson.build b/src/meson.build
index 627a14b..9b28171 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -23,10 +23,10 @@ headers = enum_headers + files(
   'models/gtd-list-store.h',
   'notification/gtd-notification.h',
   'task-list-view/gtd-task-list-view.h',
+  'gtd-clock.h',
   'gtd-object.h',
   'gtd-task.h',
   'gtd-task-list.h',
-  'gtd-timer.h',
   'gtd-types.h',
   'gtd-utils.h',
   'gtd-window.h',
@@ -72,6 +72,7 @@ sources = files(
   'widgets/gtd-row-header.c',
   'gtd-application.c',
   'gtd-initial-setup-window.c',
+  'gtd-clock.c',
   'gtd-object.c',
   'gtd-plugin-dialog.c',
   'gtd-plugin-dialog-row.c',
@@ -79,7 +80,6 @@ sources = files(
   'gtd-task.c',
   'gtd-task-list.c',
   'gtd-task-list-panel.c',
-  'gtd-timer.c',
   'gtd-utils.c',
   'gtd-window.c',
   'main.c'
@@ -242,14 +242,14 @@ if get_option('introspection')
     'task-list-view/gtd-task-list-view.c',
     'task-list-view/gtd-task-list-view.h',
     'gtd-enums.h',
+    'gtd-clock.c',
+    'gtd-clock.h',
     'gtd-object.c',
     'gtd-object.h',
     'gtd-task.c',
     'gtd-task.h',
     'gtd-task-list.c',
     'gtd-task-list.h',
-    'gtd-timer.c',
-    'gtd-timer.h',
     'gtd-types.h',
     'gtd-window.c',
     'gtd-window.h'