Codebase list mozc / 4356135
Add std:: prefix BUG=#392 TEST=unittest REF_BUG=71969651 REF_CL=184975808 REF_TIME=2018-02-08T21:25:52+09:00 REF_TIME_RAW=1518092752 +0900 Hiroyuki Komatsu 6 years ago
7 changed file(s) with 19 addition(s) and 17 deletion(s). Raw diff Collapse all Expand all
125125 // but this hack looks simpler.
126126 jbyteArray result = new _jbyteArray;
127127 jbyte *buf = new jbyte[size];
128 byte_array_map_[result] = make_pair(size, buf);
128 byte_array_map_[result] = std::make_pair(size, buf);
129129 return result;
130130 }
131131
2929
3030 MAJOR=2
3131 MINOR=23
32 BUILD=2801
32 BUILD=2802
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
285285 const QString i18n_status = tr(statuses[i].toStdString().data());
286286 i18n_statuses.append(i18n_status);
287287 normalized_status_map_.insert(
288 make_pair(i18n_status.toStdString(), statuses[i].toStdString()));
288 std::make_pair(i18n_status.toStdString(), statuses[i].toStdString()));
289289 }
290290 status_delegate_->SetItemList(i18n_statuses);
291291
296296 const QString i18n_command = tr(commands[i].toStdString().data());
297297 i18n_commands.append(i18n_command);
298298 normalized_command_map_.insert(
299 make_pair(i18n_command.toStdString(), commands[i].toStdString()));
299 std::make_pair(i18n_command.toStdString(), commands[i].toStdString()));
300300 }
301301 i18n_commands.sort();
302302 commands_delegate_->SetItemList(i18n_commands);
351351 params.push_back(std::make_pair("os_ver", SystemUtil::GetOSVersionString()));
352352 #ifdef OS_ANDROID
353353 params.push_back(
354 make_pair("model",
355 AndroidUtil::GetSystemProperty(
356 AndroidUtil::kSystemPropertyModel, "Unknown")));
354 std::make_pair("model",
355 AndroidUtil::GetSystemProperty(
356 AndroidUtil::kSystemPropertyModel, "Unknown")));
357357 #endif // OS_ANDROID
358358
359359 {
190190 std::make_pair("os_ver", SystemUtil::GetOSVersionString()));
191191 #ifdef OS_ANDROID
192192 params.push_back(
193 make_pair("model",
194 AndroidUtil::GetSystemProperty(
195 AndroidUtil::kSystemPropertyModel, "Unknown")));
193 std::make_pair("model",
194 AndroidUtil::GetSystemProperty(
195 AndroidUtil::kSystemPropertyModel, "Unknown")));
196196 #endif // OS_ANDROID
197197
198198 string url = string(kBaseUrl) + "?";
161161 return true;
162162 }
163163
164 for (vector<UIMessage>::const_iterator it = messages.begin();
164 for (std::vector<UIMessage>::const_iterator it = messages.begin();
165165 it != messages.end(); ++it) {
166166 if (UIVisibilityTracker::IsVisibilityTestMessageForComposiwionWindow(
167167 it->message(), it->wparam(), it->lparam())) {
482482
483483 // Notify IMN_CLOSECANDIDATE.
484484 std::vector<UIMessage> other_candidate_messages;
485 for (vector<UIMessage>::const_iterator it = candidate_messages.begin();
485 for (std::vector<UIMessage>::const_iterator it = candidate_messages.begin();
486486 it != candidate_messages.end(); ++it) {
487487 const bool is_close_candidate = ((it->message() == WM_IME_NOTIFY) &&
488488 (it->wparam() == IMN_CLOSECANDIDATE));
496496 // Notify all composition UI messages except for WM_IME_ENDCOMPOSITION.
497497 // Typically WM_IME_STARTCOMPOSITION / WM_IME_COMPOSITION will be handled.
498498 std::vector<UIMessage> end_composition_messages;
499 for (vector<UIMessage>::const_iterator it = composition_messages.begin();
499 for (std::vector<UIMessage>::const_iterator it = composition_messages.begin();
500500 it != composition_messages.end(); ++it) {
501501 if (it->message() == WM_IME_ENDCOMPOSITION) {
502502 end_composition_messages.push_back(*it);
507507
508508 // Notify all other candidate UI messages.
509509 // Typically IMN_OPENCANDIDATE and IMN_CHANGECANDIDATE will be handled.
510 for (vector<UIMessage>::const_iterator it = other_candidate_messages.begin();
510 for (std::vector<UIMessage>::const_iterator it =
511 other_candidate_messages.begin();
511512 it != other_candidate_messages.end(); ++it) {
512513 DCHECK(!((it->message() == WM_IME_NOTIFY) &&
513514 (it->wparam() == IMN_CLOSECANDIDATE)));
515516 }
516517
517518 // Notify WM_IME_ENDCOMPOSITION
518 for (vector<UIMessage>::const_iterator it = end_composition_messages.begin();
519 for (std::vector<UIMessage>::const_iterator it =
520 end_composition_messages.begin();
519521 it != end_composition_messages.end(); ++it) {
520522 DCHECK_EQ(WM_IME_ENDCOMPOSITION, it->message());
521523 sorted_messages->push_back(*it);
656658 // Allow visibility trackers to track if each UI message will be
657659 UIVisibilityTracker *ui_visibility_tracker =
658660 private_context->ui_visibility_tracker;
659 for (vector<UIMessage>::const_iterator it = sorted_messages.begin();
661 for (std::vector<UIMessage>::const_iterator it = sorted_messages.begin();
660662 it != sorted_messages.end(); ++it) {
661663 if (UIVisibilityTracker::IsVisibilityTestMessageForCandidateWindow(
662664 it->message(), it->wparam(), it->lparam())) {
4242 namespace {
4343
4444 template <typename T>
45 void Dedup(vector<T> *container) {
45 void Dedup(std::vector<T> *container) {
4646 sort(container->begin(), container->end());
4747 auto new_end = unique(container->begin(), container->end());
4848 container->erase(new_end, container->end());