[gnote] Replace std::string by Glib::ustring in Preferences
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Replace std::string by Glib::ustring in Preferences
- Date: Sat, 4 Feb 2017 18:03:28 +0000 (UTC)
commit ca25a860924e5a324fa1c46566ba2f6deb19273a
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sat Feb 4 20:01:58 2017 +0200
Replace std::string by Glib::ustring in Preferences
src/preferences.cpp | 6 +++---
src/preferences.hpp | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 4168ac5..6bc5baf 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -1,7 +1,7 @@
/*
* gnote
*
- * Copyright (C) 2011-2015 Aurimas Cernius
+ * Copyright (C) 2011-2015,2017 Aurimas Cernius
* Copyright (C) 2009 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
@@ -88,9 +88,9 @@ namespace gnote {
m_schemas[SCHEMA_KEYBINDINGS] = Gio::Settings::create(SCHEMA_KEYBINDINGS);
}
- Glib::RefPtr<Gio::Settings> Preferences::get_schema_settings(const std::string & schema)
+ Glib::RefPtr<Gio::Settings> Preferences::get_schema_settings(const Glib::ustring & schema)
{
- std::map<std::string, Glib::RefPtr<Gio::Settings> >::iterator iter = m_schemas.find(schema);
+ auto iter = m_schemas.find(schema);
if(iter != m_schemas.end()) {
return iter->second;
}
diff --git a/src/preferences.hpp b/src/preferences.hpp
index 8b4bdd1..a2707be 100644
--- a/src/preferences.hpp
+++ b/src/preferences.hpp
@@ -1,7 +1,7 @@
/*
* gnote
*
- * Copyright (C) 2011-2015 Aurimas Cernius
+ * Copyright (C) 2011-2015,2017 Aurimas Cernius
* Copyright (C) 2009 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,6 @@
#define __PREFERENCES_HPP_
#include <map>
-#include <string>
#include <sigc++/signal.h>
#include <giomm/settings.h>
@@ -93,10 +92,10 @@ namespace gnote {
Preferences();
- Glib::RefPtr<Gio::Settings> get_schema_settings(const std::string & schema);
+ Glib::RefPtr<Gio::Settings> get_schema_settings(const Glib::ustring & schema);
private:
Preferences(const Preferences &); // non implemented
- std::map<std::string, Glib::RefPtr<Gio::Settings> > m_schemas;
+ std::map<Glib::ustring, Glib::RefPtr<Gio::Settings> > m_schemas;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]