[gnote] Cleanup sync constants

[Aurimas Černius <aurimasc src gnome org>]

commit c5a4468151001c937c3346f538d534bf6a8d98bb
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Dec 13 00:02:30 2020 +0200

    Cleanup sync constants

 src/preferences.cpp | 13 +++++++------
 src/preferences.hpp |  8 ++------
 2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 5d6aa088..ce12cdcc 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -24,12 +24,16 @@
 
 
 const char *SCHEMA_DESKTOP_GNOME_INTERFACE = "org.gnome.desktop.interface";
+const char *SCHEMA_SYNC = "org.gnome.gnote.sync";
+
+const Glib::ustring SYNC_CLIENT_ID = "sync-guid";
+const Glib::ustring SYNC_LOCAL_PATH = "sync-local-path";
+const Glib::ustring SYNC_CONFIGURED_CONFLICT_BEHAVIOR = "sync-conflict-behavior";
 
 namespace gnote {
 
 
   const char * Preferences::SCHEMA_GNOTE = "org.gnome.gnote";
-  const char * Preferences::SCHEMA_SYNC = "org.gnome.gnote.sync";
   const char * Preferences::SCHEMA_SYNC_GVFS = "org.gnome.gnote.sync.gvfs";
   const char * Preferences::SCHEMA_SYNC_WDFS = "org.gnome.gnote.sync.wdfs";
 
@@ -47,11 +51,8 @@ namespace gnote {
   const char * Preferences::MENU_NOTE_COUNT = "menu-note-count";
   const char * Preferences::MENU_PINNED_NOTES = "menu-pinned-notes";
 
-  const char * Preferences::SYNC_CLIENT_ID = "sync-guid";
-  const char * Preferences::SYNC_LOCAL_PATH = "sync-local-path";
-  const char * Preferences::SYNC_SELECTED_SERVICE_ADDIN = "sync-selected-service-addin";
-  const char * Preferences::SYNC_CONFIGURED_CONFLICT_BEHAVIOR = "sync-conflict-behavior";
-  const char * Preferences::SYNC_AUTOSYNC_TIMEOUT = "autosync-timeout";
+  const Glib::ustring Preferences::SYNC_SELECTED_SERVICE_ADDIN = "sync-selected-service-addin";
+  const Glib::ustring Preferences::SYNC_AUTOSYNC_TIMEOUT = "autosync-timeout";
 
   const char * Preferences::NOTE_RENAME_BEHAVIOR = "note-rename-behavior";
   const char * Preferences::USE_STATUS_ICON = "use-status-icon";
diff --git a/src/preferences.hpp b/src/preferences.hpp
index 44fe29f6..2ed7c013 100644
--- a/src/preferences.hpp
+++ b/src/preferences.hpp
@@ -33,7 +33,6 @@ namespace gnote {
   {
   public:
     static const char *SCHEMA_GNOTE;
-    static const char *SCHEMA_SYNC;
     static const char *SCHEMA_SYNC_GVFS;
     static const char *SCHEMA_SYNC_WDFS;
 
@@ -63,11 +62,8 @@ namespace gnote {
     static const char *SEARCH_SORTING;
     static const char *USE_CLIENT_SIDE_DECORATIONS;
 
-    static const char *SYNC_CLIENT_ID;
-    static const char *SYNC_LOCAL_PATH;
-    static const char *SYNC_SELECTED_SERVICE_ADDIN;
-    static const char *SYNC_CONFIGURED_CONFLICT_BEHAVIOR;
-    static const char *SYNC_AUTOSYNC_TIMEOUT;
+    static const Glib::ustring SYNC_SELECTED_SERVICE_ADDIN;
+    static const Glib::ustring SYNC_AUTOSYNC_TIMEOUT;
 
     static const char *SYNC_GVFS_URI;