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

4
src/Gui/NavigationStyle.cpp
View File

@@ -1498,12 +1498,12 @@ void NavigationStyle::openPopupMenu(const SbVec2s& position)
contextMenu.addMenu(&subMenu);
// add submenu at the end to select navigation style
QRegExp rx(QString::fromAscii("^\\w+::(\\w+)Navigation\\w+$"));
QRegExp rx(QString::fromLatin1("^\\w+::(\\w+)Navigation\\w+$"));
std::vector<Base::Type> types;
Base::Type::getAllDerivedFrom(UserNavigationStyle::getClassTypeId(), types);
for (std::vector<Base::Type>::iterator it = types.begin(); it != types.end(); ++it) {
if (*it != UserNavigationStyle::getClassTypeId()) {
QString data = QString::fromAscii(it->getName());
QString data = QString::fromLatin1(it->getName());
QString name = data.mid(data.indexOf(QLatin1String("::"))+2);
if (rx.indexIn(data) > -1) {
name = QObject::tr("%1 navigation").arg(rx.cap(1));