Qt4/Qt5 neutral changes:

+ remove QCoreApplication::UnicodeUTF8/QApplication::UnicodeUTF8
+ remove QCoreApplication::CodecForTr/QApplication::CodecForTr
This commit is contained in:
wmayer
2016-12-12 14:52:09 +01:00
parent 25cfb0bc1e
commit d2cb4e4af9
13 changed files with 95 additions and 151 deletions

View File

@@ -22,7 +22,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#ifndef _PreComp_
# include <QApplication>
# include <QAction>
# include <QToolBar>
@@ -200,8 +200,7 @@ void ToolBarManager::setup(ToolBarItem* toolBarItems)
if (!toolbar) {
toolbar = getMainWindow()->addToolBar(
QApplication::translate("Workbench",
toolbarName.c_str(),
0, QApplication::UnicodeUTF8)); // i18n
toolbarName.c_str())); // i18n
toolbar->setObjectName(name);
toolbar->setVisible(visible);
toolbar_added = true;
@@ -324,8 +323,7 @@ void ToolBarManager::retranslate() const
QByteArray toolbarName = (*it)->objectName().toUtf8();
(*it)->setWindowTitle(
QApplication::translate("Workbench",
(const char*)toolbarName,
0, QApplication::UnicodeUTF8));
(const char*)toolbarName));
}
}