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

18
src/Gui/MenuManager.cpp
View File

@@ -198,7 +198,7 @@ void MenuManager::setup(MenuItem* menuItems) const
for (QList<MenuItem*>::ConstIterator it = items.begin(); it != items.end(); ++it)
{
// search for the menu action
QAction* action = findAction(actions, QString::fromAscii((*it)->command().c_str()));
QAction* action = findAction(actions, QString::fromLatin1((*it)->command().c_str()));
if (!action) {
// There must be not more than one separator in the menu bar, so
// we can safely remove it if available and append it at the end
@@ -213,12 +213,12 @@ void MenuManager::setup(MenuItem* menuItems) const
QApplication::translate("Workbench", menuName.c_str(),
0, QApplication::UnicodeUTF8));
action = menu->menuAction();
menu->setObjectName(QString::fromAscii(menuName.c_str()));
action->setObjectName(QString::fromAscii(menuName.c_str()));
menu->setObjectName(QString::fromLatin1(menuName.c_str()));
action->setObjectName(QString::fromLatin1(menuName.c_str()));
}
// set the menu user data
action->setData(QString::fromAscii((*it)->command().c_str()));
action->setData(QString::fromLatin1((*it)->command().c_str()));
}
else {
// put the menu at the end
@@ -250,7 +250,7 @@ void MenuManager::setup(MenuItem* item, QMenu* menu) const
QList<QAction*> actions = menu->actions();
for (QList<MenuItem*>::ConstIterator it = items.begin(); it != items.end(); ++it) {
// search for the menu item
QList<QAction*> used_actions = findActions(actions, QString::fromAscii((*it)->command().c_str()));
QList<QAction*> used_actions = findActions(actions, QString::fromLatin1((*it)->command().c_str()));
if (used_actions.isEmpty()) {
if ((*it)->command() == "Separator") {
QAction* action = menu->addSeparator();
@@ -267,10 +267,10 @@ void MenuManager::setup(MenuItem* item, QMenu* menu) const
QApplication::translate("Workbench", menuName.c_str(),
0, QApplication::UnicodeUTF8));
QAction* action = submenu->menuAction();
submenu->setObjectName(QString::fromAscii((*it)->command().c_str()));
action->setObjectName(QString::fromAscii((*it)->command().c_str()));
submenu->setObjectName(QString::fromLatin1((*it)->command().c_str()));
action->setObjectName(QString::fromLatin1((*it)->command().c_str()));
// set the menu user data
action->setData(QString::fromAscii((*it)->command().c_str()));
action->setData(QString::fromLatin1((*it)->command().c_str()));
used_actions.append(action);
}
else {
@@ -282,7 +282,7 @@ void MenuManager::setup(MenuItem* item, QMenu* menu) const
for (int i=count; i < acts.count(); i++) {
QAction* a = acts[i];
// set the menu user data
a->setData(QString::fromAscii((*it)->command().c_str()));
a->setData(QString::fromLatin1((*it)->command().c_str()));
used_actions.append(a);
}
}