Skip to content

Commit

Permalink
QString::fromAscii() is obsolete in Qt5. Replace it with fromLatin1().
Browse files Browse the repository at this point in the history
This change is Qt4/Qt5 neutral.
  • Loading branch information
f3nix authored and yorikvanhavre committed Jul 7, 2016
1 parent 873f8e3 commit 8b2f435
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Mod/Fem/Gui/TaskPostBoxes.cpp
Expand Up @@ -107,7 +107,7 @@ bool TaskDlgPost::accept()
(*it)->applyPythonCode();
}
catch (const Base::Exception& e) {
QMessageBox::warning(NULL, tr("Input error"), QString::fromAscii(e.what()));
QMessageBox::warning(NULL, tr("Input error"), QString::fromLatin1(e.what()));
return false;
}

Expand Down Expand Up @@ -297,7 +297,7 @@ void TaskPostClip::collectImplicitFunctions() {
const std::vector<App::DocumentObject*>& funcs = static_cast<Fem::FemPostFunctionProvider*>(
pipeline->Functions.getValue())->Functions.getValues();
for(std::size_t i=0; i<funcs.size(); ++i)
items.push_back(QString::fromAscii(funcs[i]->getNameInDocument()));
items.push_back(QString::fromLatin1(funcs[i]->getNameInDocument()));

ui->FunctionBox->addItems(items);
}
Expand Down Expand Up @@ -589,7 +589,7 @@ void TaskPostCut::collectImplicitFunctions() {
const std::vector<App::DocumentObject*>& funcs = static_cast<Fem::FemPostFunctionProvider*>(
pipeline->Functions.getValue())->Functions.getValues();
for(std::size_t i=0; i<funcs.size(); ++i)
items.push_back(QString::fromAscii(funcs[i]->getNameInDocument()));
items.push_back(QString::fromLatin1(funcs[i]->getNameInDocument()));

ui->FunctionBox->addItems(items);
}
Expand Down

0 comments on commit 8b2f435

Please sign in to comment.