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

Spreadsheet: Use Base::fromStdString/toStdString.

Browse Source
This commit is contained in:
Eivind Kvedalen
2015-08-13 23:49:00 +02:00
committed by wmayer
parent b65af55fc1
commit 6d0df4c58b
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
View File

@@ -90,9 +90,9 @@ PropertiesDialog::PropertiesDialog(Sheet *_sheet, const std::vector<Range> &_ran
if (style.find("underline") != style.end())
ui->styleUnderline->setChecked(true);
ui->displayUnit->setText(QString::fromStdString(displayUnit.stringRep));
ui->displayUnit->setText(Base::Tools::fromStdString(displayUnit.stringRep));
ui->alias->setText(QString::fromStdString(alias));
ui->alias->setText(Base::Tools::fromStdString(alias));
// Colors
connect(ui->foregroundColor, SIGNAL(colorChanged(QColor)), this, SLOT(foregroundColorChanged(QColor)));
@@ -212,7 +212,7 @@ void PropertiesDialog::aliasChanged(const QString & text)
catch (...) {
aliasOk = true;
palette.setColor(QPalette::Text, Qt::black);
alias = text.toStdString();
alias = Base::Tools::toStdString(text);
}
}
else {