From 899e841aea8e54721ce9771780b05a07de05ce71 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 25 Feb 2019 15:16:23 +0300
Subject: Jabber:

- obsolete class Xpath removed, its functionality replaced with helpers & iterators;
- JABBER_FEAT_BIND added to enchance code reading & understanding;
- unused function CNoteItem::AddNote removed;
- fix for improper jabber:x:last behavior
---
 protocols/JabberG/src/jabber_notes.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'protocols/JabberG/src/jabber_notes.cpp')

diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index 67678f107c..3b346ff64c 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -38,10 +38,10 @@ CNoteItem::CNoteItem()
 CNoteItem::CNoteItem(const TiXmlElement *hXml, const char *szFrom)
 {
 	SetData(
-		XPath(hXml, "title"),
-		szFrom ? szFrom : XPath(hXml, "@from"),
-		Utf2T(XPath(hXml, "text")),
-		XPath(hXml, "@tags"));
+		XmlGetChildText(hXml, "title"),
+		szFrom ? szFrom : hXml->Attribute("from"),
+		Utf2T(XmlGetChildText(hXml, "text")),
+		hXml->Attribute("tags"));
 }
 
 CNoteItem::~CNoteItem()
@@ -107,12 +107,6 @@ int CNoteItem::cmp(const CNoteItem *p1, const CNoteItem *p2)
 	return 0;
 }
 
-void CNoteList::AddNote(TiXmlElement *hXml, const char *szFrom)
-{
-	m_bIsModified = true;
-	insert(new CNoteItem(hXml, szFrom));
-}
-
 void CNoteList::LoadXml(const TiXmlElement *hXml)
 {
 	destroy();
-- 
cgit v1.2.3