HGGitLab

Commit 28926ef1 authored by luoliangyi's avatar luoliangyi

clearRoller里面提示改为tr翻译

parent f029b034
...@@ -1777,11 +1777,7 @@ void MainWindow::on_act_clearRoller_triggered() ...@@ -1777,11 +1777,7 @@ void MainWindow::on_act_clearRoller_triggered()
if(ret == SANE_STATUS_GOOD) if(ret == SANE_STATUS_GOOD)
QMessageBox::information(this, tr("hint"), tr("Roller scanned count has been set to 0.")); QMessageBox::information(this, tr("hint"), tr("Roller scanned count has been set to 0."));
else else
{ QMessageBox::information(this, tr("hint"), tr("Roller scanned count reset failed."));
char info[128];
sprintf(info, "Roller scanned count reset failed.");
QMessageBox::information(this, tr("hint"), QString::fromStdString(info));
}
#endif #endif
} }
......
...@@ -340,7 +340,7 @@ void WsUser::ThreadFunc() ...@@ -340,7 +340,7 @@ void WsUser::ThreadFunc()
{ {
WsCmdParam *param = new WsCmdParam; WsCmdParam *param = new WsCmdParam;
param->data = new HGByte [vAllData.size()]; param->data = new HGByte [vAllData.size()];
param->size = vAllData.size(); param->size = (HGUInt)vAllData.size();
memcpy(param->data, &vAllData[0], vAllData.size()); memcpy(param->data, &vAllData[0], vAllData.size());
WebMsg msg; WebMsg msg;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment