OSDN Git Service
(root)
/
wordring-tm
/
wordring-tm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
設定変更。
[wordring-tm/wordring-tm.git]
/
proxy
/
tmtext.cpp
diff --git
a/proxy/tmtext.cpp
b/proxy/tmtext.cpp
index
260e29c
..
c73e9b3
100644
(file)
--- a/
proxy/tmtext.cpp
+++ b/
proxy/tmtext.cpp
@@
-6,9
+6,11
@@
TM::WordLink::WordLink() { }
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()
}
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() { 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 -----------------------------------------------------------------
}
// WordLinker -----------------------------------------------------------------
@@
-224,7
+226,7
@@
TM::WordLinker::iterator TM::WordLinker::end() { return m_links.end(); }
QJsonArray TM::WordLinker::to_json_array() const
{
QJsonArray ja;
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;
}
for(WordLink::pointer const &p : m_links) ja.append(p->to_json());
return ja;
}