Codebase list mozc / a3981c7
Migrate deprecated StringPiece::CopyToString to string::assign, or construction of string, or absl::CopyToString, as appropriate. REF_BUG= REF_CL=165245504 REF_TIME=2017-08-14T16:21:28-07:00 REF_TIME_RAW=1502752888 -0700 Jorg Brown 6 years ago
9 changed file(s) with 30 addition(s) and 31 deletion(s). Raw diff Collapse all Expand all
+0
-10
src/base/string_piece_test.cc less more
431431 StringPiece e;
432432 string s2;
433433
434 // CopyToString
435 a.CopyToString(&s2);
436 ASSERT_SIZE_EQ(s2.size(), 6);
437 ASSERT_EQ(s2, "foobar");
438 b.CopyToString(&s2);
439 ASSERT_SIZE_EQ(s2.size(), 7);
440 ASSERT_EQ(s1, s2);
441 e.CopyToString(&s2);
442 ASSERT_TRUE(s2.empty());
443
444434 // starts_with
445435 ASSERT_TRUE(a.starts_with(a));
446436 ASSERT_TRUE(a.starts_with("foo"));
+1
-1
src/data/version/mozc_version_template.bzl less more
2929
3030 MAJOR=2
3131 MINOR=22
32 BUILD=2729
32 BUILD=2730
3333 REVISION=102
3434 # This version represents the version of Mozc IME engine (converter, predictor,
3535 # etc.). This version info is included both in the Mozc server and in the Mozc
+3
-2
src/dictionary/suffix_dictionary.cc less more
9696 Token token;
9797 token.attributes = Token::NONE; // Common for all suffix tokens.
9898 for (; range.first != range.second; ++range.first) {
99 (*range.first).CopyToString(&token.key);
99 token.key.assign((*range.first).data(), (*range.first).size());
100100 switch (callback->OnKey(token.key)) {
101101 case Callback::TRAVERSE_DONE:
102102 return;
112112 if (value_array_[index].empty()) {
113113 token.value = token.key;
114114 } else {
115 value_array_[index].CopyToString(&token.value);
115 token.value.assign(value_array_[index].data(),
116 value_array_[index].size());
116117 }
117118 token.lid = token_array_[3 * index];
118119 token.rid = token_array_[3 * index + 1];
+1
-1
src/dictionary/text_dictionary_loader.cc less more
281281 // of the original (correct) reading.
282282 const int kCostPenalty = 2302; // -log(1/100) * 500;
283283 std::unique_ptr<Token> token(new Token);
284 value_key.second.CopyToString(&token->key);
284 token->key.assign(value_key.second.data(), value_key.second.size());
285285 token->value = max_cost_token->value;
286286 token->lid = max_cost_token->lid;
287287 token->rid = max_cost_token->rid;
+8
-5
src/prediction/user_history_predictor.cc less more
200200 const Segment &conversion_segment = segments->conversion_segment(0);
201201 const string &segment_key = conversion_segment.key();
202202
203 // The top candidate, which is about to be commited.
203 // The top candidate, which is about to be committed.
204204 const Segment::Candidate &candidate = conversion_segment.candidate(0);
205205 const string &candidate_value = candidate.value;
206206
18221822 SegmentForLearning learning_segment;
18231823 for (Segment::Candidate::InnerSegmentIterator iter(&candidate);
18241824 !iter.Done(); iter.Next()) {
1825 iter.GetKey().CopyToString(&learning_segment.key);
1826 iter.GetValue().CopyToString(&learning_segment.value);
1827 iter.GetContentKey().CopyToString(&learning_segment.content_key);
1828 iter.GetContentValue().CopyToString(&learning_segment.content_value);
1825 learning_segment.key.assign(iter.GetKey().data(), iter.GetKey().size());
1826 learning_segment.value.assign(iter.GetValue().data(),
1827 iter.GetValue().size());
1828 learning_segment.content_key.assign(iter.GetContentKey().data(),
1829 iter.GetContentKey().size());
1830 learning_segment.content_value.assign(iter.GetContentValue().data(),
1831 iter.GetContentValue().size());
18291832 learning_segments->push_back_conversion_segment(learning_segment);
18301833 }
18311834 }
+2
-1
src/rewriter/emoticon_rewriter.cc less more
116116 c->lid = sorted_value[i].lid();
117117 c->rid = sorted_value[i].rid();
118118 c->cost = base_candidate.cost;
119 sorted_value[i].value().CopyToString(&c->value);
119 c->value.assign(sorted_value[i].value().data(),
120 sorted_value[i].value().size());
120121 c->content_value = c->value;
121122 c->key = base_candidate.key;
122123 c->content_key = base_candidate.content_key;
+2
-2
src/rewriter/symbol_rewriter.cc less more
211211 candidate->rid = iter.rid();
212212 candidate->cost = base_candidate.cost;
213213 candidate->structure_cost = base_candidate.structure_cost;
214 iter.value().CopyToString(&candidate->value);
215 iter.value().CopyToString(&candidate->content_value);
214 candidate->value.assign(iter.value().data(), iter.value().size());
215 candidate->content_value.assign(iter.value().data(), iter.value().size());
216216 candidate->key = candidate_key;
217217 candidate->content_key = candidate_key;
218218
+5
-3
src/rewriter/usage_rewriter.cc less more
235235
236236 const StringPiece value_suffix = string_array_[
237237 base_conjugation_suffix_[2 * iter.conjugation_id()]];
238 string_array_[iter.value_index()].CopyToString(&candidate->usage_title);
238 candidate->usage_title.assign(string_array_[iter.value_index()].data(),
239 string_array_[iter.value_index()].size());
239240 candidate->usage_title.append(value_suffix.data(), value_suffix.size());
240241
241 string_array_[iter.meaning_index()].CopyToString(
242 &candidate->usage_description);
242 candidate->usage_description.assign(
243 string_array_[iter.meaning_index()].data(),
244 string_array_[iter.meaning_index()].size());
243245
244246 VLOG(2) << i << ":" << j
245247 << ":" << candidate->content_key
+8
-6
src/rewriter/variants_rewriter.cc less more
280280 AppendString(kPlatformDependent, &description);
281281 }
282282
283 // The follwoing description tries to overwrite exisiting description.
283 // The follwoing description tries to overwrite existing description.
284284 // TODO(taku): reconsider this behavior.
285285 // Zipcode description
286286 if ((description_type & ZIPCODE) &&
291291 AppendString(candidate->description, &description);
292292 }
293293
294 // The follwoing description tries to overwrite exisiting description.
294 // The follwoing description tries to overwrite existing description.
295295 // TODO(taku): reconsider this behavior.
296296 // Spelling Correction description
297297 if ((description_type & SPELLING_CORRECTION) &&
481481 string inner_default_content_value, inner_alternative_content_value;
482482 for (Segment::Candidate::InnerSegmentIterator iter(&original);
483483 !iter.Done(); iter.Next()) {
484 iter.GetValue().CopyToString(&tmp);
484 tmp.assign(iter.GetValue().data(), iter.GetValue().size());
485485 inner_default_value.clear();
486486 inner_alternative_value.clear();
487487 if (!manager->ConvertConversionStringWithAlternative(
488488 tmp, &inner_default_value, &inner_alternative_value)) {
489 iter.GetValue().CopyToString(&inner_default_value);
490 iter.GetValue().CopyToString(&inner_alternative_value);
489 inner_default_value.assign(iter.GetValue().data(),
490 iter.GetValue().size());
491 inner_alternative_value.assign(iter.GetValue().data(),
492 iter.GetValue().size());
491493 } else {
492494 at_least_one_modified = true;
493495 }
494496 if (iter.GetValue() != iter.GetContentValue()) {
495497 inner_default_content_value.clear();
496498 inner_alternative_content_value.clear();
497 iter.GetContentValue().CopyToString(&tmp);
499 tmp.assign(iter.GetContentValue().data(), iter.GetContentValue().size());
498500 manager->ConvertConversionStringWithAlternative(
499501 tmp, &inner_default_content_value,
500502 &inner_alternative_content_value);