1 files changed, 12 insertions, 12 deletions

diff --git a/src/net/events.cpp b/src/net/events.cpp
index 8cc23706..a19e1738 100644
--- a/src/net/events.cpp
+++ b/src/net/events.cpp
@@ -60,7 +60,7 @@ const char* messageCountEvent::EVENT_CLASS = "messageCountEvent";
 
 
 messageCountEvent::messageCountEvent
-	(ref <folder> folder, const Types type, const std::vector <int>& nums)
+	(shared_ptr <folder> folder, const Types type, const std::vector <int>& nums)
 		: m_folder(folder), m_type(type)
 {
 	m_nums.resize(nums.size());
@@ -68,7 +68,7 @@ messageCountEvent::messageCountEvent
 }
 
 
-ref <folder> messageCountEvent::getFolder() const { return (m_folder); }
+shared_ptr <folder> messageCountEvent::getFolder() const { return (m_folder); }
 messageCountEvent::Types messageCountEvent::getType() const { return (m_type); }
 const std::vector <int>& messageCountEvent::getNumbers() const { return (m_nums); }
 
@@ -76,9 +76,9 @@ const std::vector <int>& messageCountEvent::getNumbers() const { return (m_nums)
 void messageCountEvent::dispatch(messageCountListener* listener)
 {
 	if (m_type == TYPE_ADDED)
-		listener->messagesAdded(thisRef().dynamicCast <messageCountEvent>());
+		listener->messagesAdded(dynamicCast <messageCountEvent>(shared_from_this()));
 	else
-		listener->messagesRemoved(thisRef().dynamicCast <messageCountEvent>());
+		listener->messagesRemoved(dynamicCast <messageCountEvent>(shared_from_this()));
 }
 
 
@@ -96,7 +96,7 @@ const char* messageChangedEvent::EVENT_CLASS = "messageChangedEvent";
 
 
 messageChangedEvent::messageChangedEvent
-	(ref <folder> folder, const Types type, const std::vector <int>& nums)
+	(shared_ptr <folder> folder, const Types type, const std::vector <int>& nums)
 		: m_folder(folder), m_type(type)
 {
 	m_nums.resize(nums.size());
@@ -104,14 +104,14 @@ messageChangedEvent::messageChangedEvent
 }
 
 
-ref <folder> messageChangedEvent::getFolder() const { return (m_folder); }
+shared_ptr <folder> messageChangedEvent::getFolder() const { return (m_folder); }
 messageChangedEvent::Types messageChangedEvent::getType() const { return (m_type); }
 const std::vector <int>& messageChangedEvent::getNumbers() const { return (m_nums); }
 
 
 void messageChangedEvent::dispatch(messageChangedListener* listener)
 {
-	listener->messageChanged(thisRef().dynamicCast <messageChangedEvent>());
+	listener->messageChanged(dynamicCast <messageChangedEvent>(shared_from_this()));
 }
 
 
@@ -129,14 +129,14 @@ const char* folderEvent::EVENT_CLASS = "folderEvent";
 
 
 folderEvent::folderEvent
-	(ref <folder> folder, const Types type,
+	(shared_ptr <folder> folder, const Types type,
 	 const utility::path& oldPath, const utility::path& newPath)
 	: m_folder(folder), m_type(type), m_oldPath(oldPath), m_newPath(newPath)
 {
 }
 
 
-ref <folder> folderEvent::getFolder() const { return (m_folder); }
+shared_ptr <folder> folderEvent::getFolder() const { return (m_folder); }
 folderEvent::Types folderEvent::getType() const { return (m_type); }
 
 
@@ -144,9 +144,9 @@ void folderEvent::dispatch(folderListener* listener)
 {
 	switch (m_type)
 	{
-	case TYPE_CREATED: listener->folderCreated(thisRef().dynamicCast <folderEvent>()); break;
-	case TYPE_RENAMED: listener->folderRenamed(thisRef().dynamicCast <folderEvent>()); break;
-	case TYPE_DELETED: listener->folderDeleted(thisRef().dynamicCast <folderEvent>()); break;
+	case TYPE_CREATED: listener->folderCreated(dynamicCast <folderEvent>(shared_from_this())); break;
+	case TYPE_RENAMED: listener->folderRenamed(dynamicCast <folderEvent>(shared_from_this())); break;
+	case TYPE_DELETED: listener->folderDeleted(dynamicCast <folderEvent>(shared_from_this())); break;
 	}
 }