[gnote] Use std::shared_ptr with namespace
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Use std::shared_ptr with namespace
- Date: Tue, 9 Apr 2019 18:13:09 +0000 (UTC)
commit f061ce3a2d98c9a1a5362f5595af72bb999683b6
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sun Apr 7 23:46:26 2019 +0300
Use std::shared_ptr with namespace
src/note.hpp | 4 ++--
src/notebase.hpp | 2 +-
src/notebooks/notebook.hpp | 2 +-
src/notebooks/specialnotebooks.hpp | 10 +++++-----
src/notemanager.hpp | 4 ++--
src/noterenamedialog.hpp | 2 +-
src/search.hpp | 2 +-
src/synchronization/isyncmanager.hpp | 4 ++--
src/synchronization/syncdialog.hpp | 2 +-
src/synchronization/syncui.hpp | 2 +-
src/tag.hpp | 4 ++--
src/triehit.hpp | 4 ++--
12 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/src/note.hpp b/src/note.hpp
index 4018b42a..15b62a0a 100644
--- a/src/note.hpp
+++ b/src/note.hpp
@@ -1,7 +1,7 @@
/*
* gnote
*
- * Copyright (C) 2011-2015,2017 Aurimas Cernius
+ * Copyright (C) 2011-2015,2017,2019 Aurimas Cernius
* Copyright (C) 2009 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
@@ -90,7 +90,7 @@ class Note
: public NoteBase
{
public:
- typedef shared_ptr<Note> Ptr;
+ typedef std::shared_ptr<Note> Ptr;
typedef weak_ptr<Note> WeakPtr;
typedef std::list<Ptr> List;
diff --git a/src/notebase.hpp b/src/notebase.hpp
index 0473ce66..38a5f5e4 100644
--- a/src/notebase.hpp
+++ b/src/notebase.hpp
@@ -188,7 +188,7 @@ class NoteBase
, public sigc::trackable
{
public:
- typedef shared_ptr<NoteBase> Ptr;
+ typedef std::shared_ptr<NoteBase> Ptr;
typedef weak_ptr<NoteBase> WeakPtr;
typedef std::list<Ptr> List;
diff --git a/src/notebooks/notebook.hpp b/src/notebooks/notebook.hpp
index 5a058a13..a08215c0 100644
--- a/src/notebooks/notebook.hpp
+++ b/src/notebooks/notebook.hpp
@@ -37,7 +37,7 @@ class Notebook
: public enable_shared_from_this<Notebook>
{
public:
- typedef shared_ptr<Notebook> Ptr;
+ typedef std::shared_ptr<Notebook> Ptr;
static const char * NOTEBOOK_TAG_PREFIX;
Notebook(NoteManager &, const Glib::ustring &, bool is_special = false);
Notebook(NoteManager &, const Tag::Ptr &);
diff --git a/src/notebooks/specialnotebooks.hpp b/src/notebooks/specialnotebooks.hpp
index b4c6af27..735be240 100644
--- a/src/notebooks/specialnotebooks.hpp
+++ b/src/notebooks/specialnotebooks.hpp
@@ -38,7 +38,7 @@ class SpecialNotebook
: public Notebook
{
public:
- typedef shared_ptr<SpecialNotebook> Ptr;
+ typedef std::shared_ptr<SpecialNotebook> Ptr;
virtual Glib::RefPtr<Gdk::Pixbuf> get_icon() = 0;
protected:
@@ -55,7 +55,7 @@ class AllNotesNotebook
: public SpecialNotebook
{
public:
- typedef shared_ptr<AllNotesNotebook> Ptr;
+ typedef std::shared_ptr<AllNotesNotebook> Ptr;
AllNotesNotebook(NoteManager &);
virtual Glib::ustring get_normalized_name() const override;
virtual bool contains_note(const Note::Ptr & note, bool include_system = false) override;
@@ -68,7 +68,7 @@ class UnfiledNotesNotebook
: public SpecialNotebook
{
public:
- typedef shared_ptr<UnfiledNotesNotebook> Ptr;
+ typedef std::shared_ptr<UnfiledNotesNotebook> Ptr;
UnfiledNotesNotebook(NoteManager &);
virtual Glib::ustring get_normalized_name() const override;
virtual bool contains_note(const Note::Ptr & note, bool include_system = false) override;
@@ -81,7 +81,7 @@ class PinnedNotesNotebook
: public SpecialNotebook
{
public:
- typedef shared_ptr<PinnedNotesNotebook> Ptr;
+ typedef std::shared_ptr<PinnedNotesNotebook> Ptr;
PinnedNotesNotebook(NoteManager &);
virtual Glib::ustring get_normalized_name() const override;
virtual bool contains_note(const Note::Ptr & note, bool include_system = false) override;
@@ -94,7 +94,7 @@ class ActiveNotesNotebook
: public SpecialNotebook
{
public:
- typedef shared_ptr<ActiveNotesNotebook> Ptr;
+ typedef std::shared_ptr<ActiveNotesNotebook> Ptr;
ActiveNotesNotebook(NoteManager &);
virtual Glib::ustring get_normalized_name() const override;
virtual bool contains_note(const Note::Ptr & note, bool include_system = false) override;
diff --git a/src/notemanager.hpp b/src/notemanager.hpp
index ec1ec0da..f6f7cbab 100644
--- a/src/notemanager.hpp
+++ b/src/notemanager.hpp
@@ -1,7 +1,7 @@
/*
* gnote
*
- * Copyright (C) 2010-2014,2017 Aurimas Cernius
+ * Copyright (C) 2010-2014,2017,2019 Aurimas Cernius
* Copyright (C) 2009 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@ namespace gnote {
: public NoteManagerBase
{
public:
- typedef shared_ptr<NoteManager> Ptr;
+ typedef std::shared_ptr<NoteManager> Ptr;
typedef sigc::slot<void, const Note::Ptr &> NoteChangedSlot;
NoteManager(const Glib::ustring &);
diff --git a/src/noterenamedialog.hpp b/src/noterenamedialog.hpp
index 042ac9bd..5f8d85ee 100644
--- a/src/noterenamedialog.hpp
+++ b/src/noterenamedialog.hpp
@@ -75,7 +75,7 @@ class NoteRenameDialog
{
public:
- typedef shared_ptr<std::map<NoteBase::Ptr, bool> > MapPtr;
+ typedef std::shared_ptr<std::map<NoteBase::Ptr, bool> > MapPtr;
NoteRenameDialog(const NoteBase::List & notes,
const Glib::ustring & old_title,
diff --git a/src/search.hpp b/src/search.hpp
index f94801fb..2e9d5de6 100644
--- a/src/search.hpp
+++ b/src/search.hpp
@@ -39,7 +39,7 @@ class Search
{
public:
typedef std::multimap<int,Note::Ptr> Results;
- typedef shared_ptr<Results> ResultsPtr;
+ typedef std::shared_ptr<Results> ResultsPtr;
template<typename T>
static void split_watching_quotes(std::vector<T> & split,
diff --git a/src/synchronization/isyncmanager.hpp b/src/synchronization/isyncmanager.hpp
index ad20dc36..c7b30848 100644
--- a/src/synchronization/isyncmanager.hpp
+++ b/src/synchronization/isyncmanager.hpp
@@ -47,7 +47,7 @@ public:
class SyncClient
{
public:
- typedef shared_ptr<SyncClient> Ptr;
+ typedef std::shared_ptr<SyncClient> Ptr;
virtual ~SyncClient();
@@ -79,7 +79,7 @@ public:
class SyncServer
{
public:
- typedef shared_ptr<SyncServer> Ptr;
+ typedef std::shared_ptr<SyncServer> Ptr;
virtual ~SyncServer();
diff --git a/src/synchronization/syncdialog.hpp b/src/synchronization/syncdialog.hpp
index e3dd73e3..aa5b89b8 100644
--- a/src/synchronization/syncdialog.hpp
+++ b/src/synchronization/syncdialog.hpp
@@ -39,7 +39,7 @@ namespace sync {
, public SyncUI
{
public:
- typedef shared_ptr<SyncDialog> Ptr;
+ typedef std::shared_ptr<SyncDialog> Ptr;
static Ptr create(NoteManagerBase &);
diff --git a/src/synchronization/syncui.hpp b/src/synchronization/syncui.hpp
index 6a7f4671..5dc95b4c 100644
--- a/src/synchronization/syncui.hpp
+++ b/src/synchronization/syncui.hpp
@@ -36,7 +36,7 @@ namespace sync {
: public enable_shared_from_this<SyncUI>
{
public:
- typedef shared_ptr<SyncUI> Ptr;
+ typedef std::shared_ptr<SyncUI> Ptr;
typedef sigc::slot<void> SlotConnecting;
typedef sigc::slot<void> SlotIdle;
diff --git a/src/tag.hpp b/src/tag.hpp
index 0aa568e6..035e7ad4 100644
--- a/src/tag.hpp
+++ b/src/tag.hpp
@@ -1,7 +1,7 @@
/*
* gnote
*
- * Copyright (C) 2013-2014,2017 Aurimas Cernius
+ * Copyright (C) 2013-2014,2017,2019 Aurimas Cernius
* Copyright (C) 2009 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
@@ -45,7 +45,7 @@ namespace gnote {
class Tag
{
public:
- typedef shared_ptr<Tag> Ptr;
+ typedef std::shared_ptr<Tag> Ptr;
static const char * SYSTEM_TAG_PREFIX;
Tag(const Glib::ustring & name);
diff --git a/src/triehit.hpp b/src/triehit.hpp
index 6b7eb2da..d0dfe80d 100644
--- a/src/triehit.hpp
+++ b/src/triehit.hpp
@@ -32,9 +32,9 @@ template<class value_t>
class TrieHit
{
public:
- typedef shared_ptr<TrieHit> Ptr;
+ typedef std::shared_ptr<TrieHit> Ptr;
typedef std::list<Ptr> List;
- typedef shared_ptr<List> ListPtr;
+ typedef std::shared_ptr<List> ListPtr;
TrieHit(int s, int e, const Glib::ustring & k, const value_t & v)
: m_start(s)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]