X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=proxy%2Ftmtext.cpp;h=c73e9b3d6c830c97e4f056f455052ab79052be5b;hb=80c18d1a36b9cdcab4bf487661debf7bbc5c9f3f;hp=260e29c900198ee31e7dc451086f26d9a6093a04;hpb=49a7bc0c41d0c9b30a522622abe65e2d84363b8b;p=wordring-tm%2Fwordring-tm.git

diff --git a/proxy/tmtext.cpp b/proxy/tmtext.cpp
index 260e29c..c73e9b3 100644
--- a/proxy/tmtext.cpp
+++ b/proxy/tmtext.cpp
@@ -6,9 +6,11 @@
 
 TM::WordLink::WordLink() { }
 
-TM::WordLink::WordLink(int place, Text::pointer word)
+TM::WordLink::WordLink(QJsonObject json)
 {
-	append(place, word);
+	QJsonArray ja = json["s"].toArray();
+
+	//append(json, word);
 }
 
 void TM::WordLink::clear()
@@ -105,9 +107,9 @@ QString TM::WordLink::debug_dump() const
 
 TM::WordLink::pointer TM::WordLink::create() { return pointer(new WordLink()); }
 
-TM::WordLink::pointer TM::WordLink::create(int place, Text::pointer word)
+TM::WordLink::pointer TM::WordLink::create(QJsonObject json)
 {
-	return pointer(new WordLink(place, word));
+	return pointer(new WordLink(json));
 }
 
 // WordLinker -----------------------------------------------------------------
@@ -224,7 +226,7 @@ TM::WordLinker::iterator TM::WordLinker::end() { return m_links.end(); }
 QJsonArray TM::WordLinker::to_json_array() const
 {
 	QJsonArray ja;
-	if(m_current_link) ja.append(m_current_link->to_json());
+	if(m_current_link && m_current_link->is_valid()) ja.append(m_current_link->to_json());
 	for(WordLink::pointer const &p : m_links) ja.append(p->to_json());
 	return ja;
 }