[devhelp] DhSettings: rename get() -> get_instance()



commit 855b899454599f4818f48b758c9681ccebb7079e
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Apr 28 14:32:24 2017 +0200

    DhSettings: rename get() -> get_instance()
    
    It's clearer.

 src/dh-assistant.c    |    2 +-
 src/dh-book-manager.c |    2 +-
 src/dh-preferences.c  |    2 +-
 src/dh-settings.c     |    2 +-
 src/dh-settings.h     |    2 +-
 src/dh-window.c       |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/dh-assistant.c b/src/dh-assistant.c
index ffb0122..1f541b0 100644
--- a/src/dh-assistant.c
+++ b/src/dh-assistant.c
@@ -104,7 +104,7 @@ dh_assistant_init (DhAssistant *assistant)
 
         gtk_widget_init_template (GTK_WIDGET (assistant));
 
-        priv->settings = dh_settings_get ();
+        priv->settings = dh_settings_get_instance ();
 
         g_signal_connect (priv->view, "open-uri",
                           G_CALLBACK (assistant_view_open_uri_cb),
diff --git a/src/dh-book-manager.c b/src/dh-book-manager.c
index 796574d..040b18f 100644
--- a/src/dh-book-manager.c
+++ b/src/dh-book-manager.c
@@ -248,7 +248,7 @@ dh_book_manager_init (DhBookManager *book_manager)
         priv->monitors = NULL;
         priv->languages = NULL;
         priv->books_disabled = NULL;
-        priv->settings = dh_settings_get ();
+        priv->settings = dh_settings_get_instance ();
 
         book_manager_load_books_disabled (book_manager);
         g_settings_bind (dh_settings_peek_contents_settings (priv->settings),
diff --git a/src/dh-preferences.c b/src/dh-preferences.c
index dbac0cb..5359459 100644
--- a/src/dh-preferences.c
+++ b/src/dh-preferences.c
@@ -626,7 +626,7 @@ dh_preferences_init (DhPreferences *prefs)
 
         app = g_application_get_default ();
 
-        priv->settings = dh_settings_get ();
+        priv->settings = dh_settings_get_instance ();
         priv->book_manager = g_object_ref (dh_app_peek_book_manager (DH_APP (app)));
         priv->book_created_id = g_signal_connect (priv->book_manager,
                                                   "book-created",
diff --git a/src/dh-settings.c b/src/dh-settings.c
index 3acb17c..b001310 100644
--- a/src/dh-settings.c
+++ b/src/dh-settings.c
@@ -130,7 +130,7 @@ dh_settings_init (DhSettings *self)
 }
 
 DhSettings *
-dh_settings_get (void)
+dh_settings_get_instance (void)
 {
         if (singleton == NULL) {
                 singleton = g_object_new (DH_TYPE_SETTINGS, NULL);
diff --git a/src/dh-settings.h b/src/dh-settings.h
index 8285791..5768022 100644
--- a/src/dh-settings.h
+++ b/src/dh-settings.h
@@ -51,7 +51,7 @@ struct _DhSettingsClass {
 
 GType           dh_settings_get_type                    (void) G_GNUC_CONST;
 
-DhSettings *    dh_settings_get                         (void);
+DhSettings *    dh_settings_get_instance                (void);
 
 void            dh_settings_get_selected_fonts          (DhSettings  *self,
                                                          gchar      **font_name_fixed,
diff --git a/src/dh-window.c b/src/dh-window.c
index 31124fe..06bc15f 100644
--- a/src/dh-window.c
+++ b/src/dh-window.c
@@ -668,7 +668,7 @@ dh_window_init (DhWindow *window)
         }
 
         /* handle settings */
-        priv->settings = dh_settings_get ();
+        priv->settings = dh_settings_get_instance ();
         g_signal_connect_object (priv->settings,
                                  "fonts-changed",
                                  G_CALLBACK (settings_fonts_changed_cb),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]