[gnote] Repleace get_or_load_schema_settings by get_schema_settings

[Aurimas Äernius <aurimasc src gnome org>]

commit 932b48f256b9a1faad92220d5c9784cebe61fa2a
Author: Aurimas Äernius <aurisc4 gmail com>
Date:   Sun Jan 1 23:09:24 2012 +0200

    Repleace get_or_load_schema_settings by get_schema_settings

 src/addins/exporttohtml/exporttohtmldialog.cpp     |    7 +++----
 .../inserttimestamp/inserttimestampnoteaddin.cpp   |    7 +++----
 .../inserttimestamp/inserttimestamppreferences.cpp |    6 +++---
 src/noteeditor.cpp                                 |    8 ++++----
 src/notewindow.cpp                                 |    4 ++--
 src/preferences.cpp                                |   12 +-----------
 src/preferences.hpp                                |    3 +--
 7 files changed, 17 insertions(+), 30 deletions(-)
---
diff --git a/src/addins/exporttohtml/exporttohtmldialog.cpp b/src/addins/exporttohtml/exporttohtmldialog.cpp
index fcd33c3..2372dcb 100644
--- a/src/addins/exporttohtml/exporttohtmldialog.cpp
+++ b/src/addins/exporttohtml/exporttohtmldialog.cpp
@@ -1,6 +1,7 @@
 /*
  * gnote
  *
+ * Copyright (C) 2011-2012 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -93,8 +94,7 @@ void ExportToHtmlDialog::set_export_linked_all(bool value)
 void ExportToHtmlDialog::save_preferences()
 {
   std::string dir = sharp::file_dirname(get_filename());
-  Glib::RefPtr<Gio::Settings> settings = gnote::Preferences::obj()
-    .get_or_load_schema_settings(SCHEMA_EXPORTHTML);
+  Glib::RefPtr<Gio::Settings> settings = gnote::Preferences::obj().get_schema_settings(SCHEMA_EXPORTHTML);
   settings->set_string(EXPORTHTML_LAST_DIRECTORY, dir);
   settings->set_boolean(EXPORTHTML_EXPORT_LINKED, get_export_linked());
   settings->set_boolean(EXPORTHTML_EXPORT_LINKED_ALL, get_export_linked_all());
@@ -103,8 +103,7 @@ void ExportToHtmlDialog::save_preferences()
 
 void ExportToHtmlDialog::load_preferences(const std::string & default_file)
 {
-  Glib::RefPtr<Gio::Settings> settings = gnote::Preferences::obj()
-    .get_or_load_schema_settings(SCHEMA_EXPORTHTML);
+  Glib::RefPtr<Gio::Settings> settings = gnote::Preferences::obj().get_schema_settings(SCHEMA_EXPORTHTML);
   std::string last_dir = settings->get_string(EXPORTHTML_LAST_DIRECTORY);
   if (last_dir.empty()) {
     last_dir = Glib::get_home_dir();
diff --git a/src/addins/inserttimestamp/inserttimestampnoteaddin.cpp b/src/addins/inserttimestamp/inserttimestampnoteaddin.cpp
index cfc3422..5cc089c 100644
--- a/src/addins/inserttimestamp/inserttimestampnoteaddin.cpp
+++ b/src/addins/inserttimestamp/inserttimestampnoteaddin.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2010-2011 Aurimas Cernius
+ * Copyright (C) 2010-2012 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -84,8 +84,7 @@ namespace inserttimestamp {
     m_item->show ();
     add_plugin_menu_item (m_item);
 
-    Glib::RefPtr<Gio::Settings> settings = gnote::Preferences::obj()
-      .get_or_load_schema_settings(SCHEMA_INSERT_TIMESTAMP);
+    Glib::RefPtr<Gio::Settings> settings = gnote::Preferences::obj().get_schema_settings(SCHEMA_INSERT_TIMESTAMP);
     m_date_format = settings->get_string(INSERT_TIMESTAMP_FORMAT);
     settings->signal_changed().connect(
       sigc::mem_fun(*this, &InsertTimestampNoteAddin::on_format_setting_changed));
@@ -105,7 +104,7 @@ namespace inserttimestamp {
   void InsertTimestampNoteAddin::on_format_setting_changed(const Glib::ustring & key)
   {
     if(key == INSERT_TIMESTAMP_FORMAT) {
-      m_date_format = gnote::Preferences::obj().get_or_load_schema_settings(
+      m_date_format = gnote::Preferences::obj().get_schema_settings(
           SCHEMA_INSERT_TIMESTAMP)->get_string(INSERT_TIMESTAMP_FORMAT);
     }
   }
diff --git a/src/addins/inserttimestamp/inserttimestamppreferences.cpp b/src/addins/inserttimestamp/inserttimestamppreferences.cpp
index d6ae551..5067793 100644
--- a/src/addins/inserttimestamp/inserttimestamppreferences.cpp
+++ b/src/addins/inserttimestamp/inserttimestamppreferences.cpp
@@ -1,6 +1,7 @@
 /*
  * gnote
  *
+ * Copyright (C) 2011-2012 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -57,8 +58,7 @@ namespace inserttimestamp {
   {
     _init_static();
     // Get current values
-    Glib::RefPtr<Gio::Settings> settings = Preferences::obj().get_or_load_schema_settings(
-        SCHEMA_INSERT_TIMESTAMP);
+    Glib::RefPtr<Gio::Settings> settings = Preferences::obj().get_schema_settings(SCHEMA_INSERT_TIMESTAMP);
     std::string dateFormat = settings->get_string(INSERT_TIMESTAMP_FORMAT);
 
     sharp::DateTime now = sharp::DateTime::now();
@@ -180,7 +180,7 @@ namespace inserttimestamp {
     if (iter) {
       std::string format;
       iter->get_value(1, format);
-      Preferences::obj().get_or_load_schema_settings(SCHEMA_INSERT_TIMESTAMP)->set_string(
+      Preferences::obj().get_schema_settings(SCHEMA_INSERT_TIMESTAMP)->set_string(
           INSERT_TIMESTAMP_FORMAT, format);
     }
   }
diff --git a/src/noteeditor.cpp b/src/noteeditor.cpp
index f9d605e..b373d65 100644
--- a/src/noteeditor.cpp
+++ b/src/noteeditor.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2010-2011 Aurimas Cernius
+ * Copyright (C) 2010-2012 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -41,7 +41,7 @@ namespace gnote {
     Glib::RefPtr<Gio::Settings> settings = Preferences::obj().get_schema_settings(Preferences::SCHEMA_GNOTE);
     //Set up the schema to watch the default document font
     Glib::RefPtr<Gio::Settings> desktop_settings = Preferences::obj()
-      .get_or_load_schema_settings(Preferences::SCHEMA_DESKTOP_GNOME_INTERFACE);
+      .get_schema_settings(Preferences::SCHEMA_DESKTOP_GNOME_INTERFACE);
     if(desktop_settings) {
       desktop_settings->signal_changed().connect(
         sigc::mem_fun(*this, &NoteEditor::on_font_setting_changed));
@@ -75,7 +75,7 @@ namespace gnote {
   {
     try {
       Glib::RefPtr<Gio::Settings> desktop_settings = Preferences::obj()
-        .get_or_load_schema_settings(Preferences::SCHEMA_DESKTOP_GNOME_INTERFACE);
+        .get_schema_settings(Preferences::SCHEMA_DESKTOP_GNOME_INTERFACE);
       if(desktop_settings) {
         std::string doc_font_string =
           desktop_settings->get_string(Preferences::DESKTOP_GNOME_FONT);
@@ -99,7 +99,7 @@ namespace gnote {
       if (!Preferences::obj().get_schema_settings(
           Preferences::SCHEMA_GNOTE)->get_boolean(Preferences::ENABLE_CUSTOM_FONT)) {
         Glib::RefPtr<Gio::Settings> desktop_settings = Preferences::obj()
-          .get_or_load_schema_settings(Preferences::SCHEMA_DESKTOP_GNOME_INTERFACE);
+          .get_schema_settings(Preferences::SCHEMA_DESKTOP_GNOME_INTERFACE);
         if(desktop_settings) {
           std::string value = desktop_settings->get_string(key);
           modify_font_from_string(value);
diff --git a/src/notewindow.cpp b/src/notewindow.cpp
index 5e86000..65a0df4 100644
--- a/src/notewindow.cpp
+++ b/src/notewindow.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2011 Aurimas Cernius
+ * Copyright (C) 2011-2012 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -138,7 +138,7 @@ namespace gnote {
     // Don't set up Ctrl-W or Ctrl-N if Emacs is in use
     bool using_emacs = false;
     Glib::RefPtr<Gio::Settings> desktop_settings = Preferences::obj()
-      .get_or_load_schema_settings(Preferences::SCHEMA_DESKTOP_GNOME_INTERFACE);
+      .get_schema_settings(Preferences::SCHEMA_DESKTOP_GNOME_INTERFACE);
     if(desktop_settings) {
       std::string gtk_key_theme = 
         desktop_settings->get_string(Preferences::DESKTOP_GNOME_KEY_THEME);
diff --git a/src/preferences.cpp b/src/preferences.cpp
index c395f11..aabe6e4 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2011 Aurimas Cernius
+ * Copyright (C) 2011-2012 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -83,16 +83,6 @@ namespace gnote {
       return iter->second;
     }
 
-    return Glib::RefPtr<Gio::Settings>();
-  }
-
-  Glib::RefPtr<Gio::Settings> Preferences::get_or_load_schema_settings(const std::string & schema)
-  {
-    std::map<std::string, Glib::RefPtr<Gio::Settings> >::iterator iter = m_schemas.find(schema);
-    if(iter != m_schemas.end()) {
-      return iter->second;
-    }
-
     Glib::RefPtr<Gio::Settings> settings = Gio::Settings::create(schema);
     if(settings) {
       m_schemas[schema] = settings;
diff --git a/src/preferences.hpp b/src/preferences.hpp
index 7372a1e..c9e5e0a 100644
--- a/src/preferences.hpp
+++ b/src/preferences.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2011 Aurimas Cernius
+ * Copyright (C) 2011-2012 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -82,7 +82,6 @@ namespace gnote {
     Preferences();
 
     Glib::RefPtr<Gio::Settings> get_schema_settings(const std::string & schema);
-    Glib::RefPtr<Gio::Settings> get_or_load_schema_settings(const std::string & schema);
   private:
     Preferences(const Preferences &); // non implemented
     std::map<std::string, Glib::RefPtr<Gio::Settings> > m_schemas;