diff --git a/src/Mod/Assembly/Gui/Command.cpp b/src/Mod/Assembly/Gui/Command.cpp index dbdb6e47c9..954c217872 100644 --- a/src/Mod/Assembly/Gui/Command.cpp +++ b/src/Mod/Assembly/Gui/Command.cpp @@ -179,11 +179,11 @@ void CmdAssemblyAddExistingComponent::activated(int iMsg) // asking for file name (only step at the moment) QStringList filter; - filter << QString::fromAscii("STEP (*.stp *.step)"); - filter << QString::fromAscii("IGES (*.igs *.iges)"); - filter << QString::fromAscii("BREP (*.brp *.brep)"); - filter << QString::fromAscii("Mesh (*.stl *.obj)"); - filter << QString::fromAscii("VRML (*.wrl)"); + filter << QString::fromLatin1("STEP (*.stp *.step)"); + filter << QString::fromLatin1("IGES (*.igs *.iges)"); + filter << QString::fromLatin1("BREP (*.brp *.brep)"); + filter << QString::fromLatin1("Mesh (*.stl *.obj)"); + filter << QString::fromLatin1("VRML (*.wrl)"); QString select; QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString(), QString(), filter.join(QLatin1String(";;")), &select); @@ -237,11 +237,11 @@ void CmdAssemblyImport::activated(int iMsg) // asking for file name (only step at the moment) QStringList filter; - filter << QString::fromAscii("STEP (*.stp *.step)"); - filter << QString::fromAscii("IGES (*.igs *.iges)"); - filter << QString::fromAscii("BREP (*.brp *.brep)"); - filter << QString::fromAscii("Mesh (*.stl *.obj)"); - filter << QString::fromAscii("VRML (*.wrl)"); + filter << QString::fromLatin1("STEP (*.stp *.step)"); + filter << QString::fromLatin1("IGES (*.igs *.iges)"); + filter << QString::fromLatin1("BREP (*.brp *.brep)"); + filter << QString::fromLatin1("Mesh (*.stl *.obj)"); + filter << QString::fromLatin1("VRML (*.wrl)"); QString select; QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString(), QString(), filter.join(QLatin1String(";;")), &select); diff --git a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp index d826c611e5..2ede437e51 100644 --- a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp +++ b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp @@ -68,14 +68,14 @@ TaskAssemblyConstraints::TaskAssemblyConstraints(ViewProviderConstraint* vp) if(obj->First.getValue()) { QString str; - str = QString::fromAscii(obj->First.getValue()->getNameInDocument()) + QString::fromAscii(".") + QString::fromStdString(obj->First.getSubValues().front()); + str = QString::fromLatin1(obj->First.getValue()->getNameInDocument()) + QString::fromLatin1(".") + QString::fromStdString(obj->First.getSubValues().front()); ui->first_geom->setText(str); ass = dynamic_cast(obj->First.getValue())->getParentAssembly(); }; if(obj->Second.getValue()) { QString str; - str = QString::fromAscii(obj->Second.getValue()->getNameInDocument()) + QString::fromAscii(".") + QString::fromStdString(obj->Second.getSubValues().front()); + str = QString::fromLatin1(obj->Second.getValue()->getNameInDocument()) + QString::fromLatin1(".") + QString::fromStdString(obj->Second.getSubValues().front()); ui->second_geom->setText(str); if(!ass) @@ -258,7 +258,7 @@ void TaskAssemblyConstraints::onSelectionChanged(const Gui::SelectionChanges& ms // std::pair part1 = static_cast(ActiveAsmObject)->getContainingPart(objs.back().getObject()); // con->First.setValue(part1.first, objs.back().getSubNames()); // QString str; - // str = QString::fromAscii(part1.first->getNameInDocument()) + QString::fromAscii(".") + QString::fromStdString(con->First.getSubValues().front()); + // str = QString::fromLatin1(part1.first->getNameInDocument()) + QString::fromLatin1(".") + QString::fromStdString(con->First.getSubValues().front()); // ui->first_geom->setText(str); // App::GetApplication().getActiveDocument()->recompute(); @@ -281,7 +281,7 @@ void TaskAssemblyConstraints::onSelectionChanged(const Gui::SelectionChanges& ms // std::pair part2 = static_cast(ActiveAsmObject)->getContainingPart(objs.back().getObject()); // con->Second.setValue(part2.first, objs.back().getSubNames()); // QString str; - // str = QString::fromAscii(part2.first->getNameInDocument()) + QString::fromAscii(".") + QString::fromStdString(con->Second.getSubValues().front()); + // str = QString::fromLatin1(part2.first->getNameInDocument()) + QString::fromLatin1(".") + QString::fromStdString(con->Second.getSubValues().front()); // ui->second_geom->setText(str); // App::GetApplication().getActiveDocument()->recompute(); diff --git a/src/Mod/Assembly/Gui/ViewProviderPartRef.cpp b/src/Mod/Assembly/Gui/ViewProviderPartRef.cpp index 2379135384..381f6f6e77 100644 --- a/src/Mod/Assembly/Gui/ViewProviderPartRef.cpp +++ b/src/Mod/Assembly/Gui/ViewProviderPartRef.cpp @@ -170,21 +170,21 @@ void ViewProviderPartRef::drop(const std::vector &ob // if (par) { // // allow an object to be in one group only // QString cmd; - // cmd = QString::fromAscii("App.getDocument(\"%1\").getObject(\"%2\").removeObject(" + // cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").removeObject(" // "App.getDocument(\"%1\").getObject(\"%3\"))") - // .arg(QString::fromAscii(doc->getName())) - // .arg(QString::fromAscii(par->getNameInDocument())) - // .arg(QString::fromAscii(obj->getNameInDocument())); + // .arg(QString::fromLatin1(doc->getName())) + // .arg(QString::fromLatin1(par->getNameInDocument())) + // .arg(QString::fromLatin1(obj->getNameInDocument())); // Gui::Application::Instance->runPythonCode(cmd.toUtf8()); // } // // build Python command for execution // QString cmd; - // cmd = QString::fromAscii("App.getDocument(\"%1\").getObject(\"%2\").addObject(" + // cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").addObject(" // "App.getDocument(\"%1\").getObject(\"%3\"))") - // .arg(QString::fromAscii(doc->getName())) - // .arg(QString::fromAscii(grp->getNameInDocument())) - // .arg(QString::fromAscii(obj->getNameInDocument())); + // .arg(QString::fromLatin1(doc->getName())) + // .arg(QString::fromLatin1(grp->getNameInDocument())) + // .arg(QString::fromLatin1(obj->getNameInDocument())); // // Gui::Application::Instance->runPythonCode(cmd.toUtf8()); //}