kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

QString::fromAscii() is obsolete in Qt5. Replace it with fromLatin1().

Browse Source 
This change is Qt4/Qt5 neutral.
This commit is contained in:
Mateusz Skowroński
2015-12-15 07:00:20 +01:00
committed by wmayer
parent d5c074f80d
commit cd2db00f22
154 changed files with 836 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
View File

@@ -121,7 +121,7 @@ void TaskPolarPatternParameters::setupUI()
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); ++i)
{
if ((*i) != NULL) { // find the first valid original
ui->lineOriginal->setText(QString::fromAscii((*i)->getNameInDocument()));
ui->lineOriginal->setText(QString::fromLatin1((*i)->getNameInDocument()));
break;
}
}
@@ -159,7 +159,7 @@ void TaskPolarPatternParameters::updateUI()
if (axes.front() == "N_Axis")
ui->comboAxis->setCurrentIndex(0);
else if (axisFeature != NULL && !axes.empty()) {
ui->comboAxis->addItem(QString::fromAscii(axes.front().c_str()));
ui->comboAxis->addItem(QString::fromLatin1(axes.front().c_str()));
ui->comboAxis->setCurrentIndex(1);
}
} else {
@@ -200,7 +200,7 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges&
std::string subName(msg.pSubName);
if (originalSelected(msg)) {
ui->lineOriginal->setText(QString::fromAscii(msg.pObjectName));
ui->lineOriginal->setText(QString::fromLatin1(msg.pObjectName));
} else if (referenceSelectionMode &&
(subName.size() > 4 && subName.substr(0,4) == "Edge")) {
@@ -220,7 +220,7 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges&
for (int i=ui->comboAxis->count()-1; i >= 1; i--)
ui->comboAxis->removeItem(i);
ui->comboAxis->addItem(QString::fromAscii(subName.c_str()));
ui->comboAxis->addItem(QString::fromLatin1(subName.c_str()));
ui->comboAxis->setCurrentIndex(1);
ui->comboAxis->addItem(tr("Select reference..."));
}
@@ -401,7 +401,7 @@ bool TaskDlgPolarPatternParameters::accept()
parameter->apply();
}
catch (const Base::Exception& e) {
QMessageBox::warning(parameter, tr("Input error"), QString::fromAscii(e.what()));
QMessageBox::warning(parameter, tr("Input error"), QString::fromLatin1(e.what()));
return false;
}