Skip to content

Commit

Permalink
Qt4/Qt5 neutral changes:
Browse files Browse the repository at this point in the history 
+ remove QCoreApplication::UnicodeUTF8/QApplication::UnicodeUTF8
+ remove QCoreApplication::CodecForTr/QApplication::CodecForTr
  • Loading branch information
@wwmayer
wwmayer committed Dec 12, 2016
1 parent 25cfb0b commit d2cb4e4
Show file tree
Hide file tree
Showing 13 changed files with 95 additions and 151 deletions.
18 changes: 6 additions & 12 deletions src/Gui/Command.cpp
View file
Expand Up @@ -607,27 +607,21 @@ const char * Command::endCmdHelp(void)
void Command::applyCommandData(const char* context, Action* action)
{
action->setText(QCoreApplication::translate(
context, getMenuText(), 0,
QCoreApplication::UnicodeUTF8));
context, getMenuText()));
action->setToolTip(QCoreApplication::translate(
context, getToolTipText(), 0,
QCoreApplication::UnicodeUTF8));
context, getToolTipText()));
if (sStatusTip)
action->setStatusTip(QCoreApplication::translate(
context, getStatusTip(), 0,
QCoreApplication::UnicodeUTF8));
context, getStatusTip()));
else
action->setStatusTip(QCoreApplication::translate(
context, getToolTipText(), 0,
QCoreApplication::UnicodeUTF8));
context, getToolTipText()));
if (sWhatsThis)
action->setWhatsThis(QCoreApplication::translate(
context, getWhatsThis(), 0,
QCoreApplication::UnicodeUTF8));
context, getWhatsThis()));
else
action->setWhatsThis(QCoreApplication::translate(
context, getToolTipText(), 0,
QCoreApplication::UnicodeUTF8));
context, getToolTipText()));
QString accel = action->shortcut().toString(QKeySequence::NativeText);
if (!accel.isEmpty()) {
// show shortcut inside tooltip
Expand Down
18 changes: 6 additions & 12 deletions src/Gui/CommandStd.cpp
View file
Expand Up @@ -196,14 +196,11 @@ Action * StdCmdAbout::createAction(void)
QString exe = qApp->applicationName();
pcAction = new Action(this,getMainWindow());
pcAction->setText(QCoreApplication::translate(
this->className(), sMenuText, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sMenuText).arg(exe));
pcAction->setToolTip(QCoreApplication::translate(
this->className(), sToolTipText, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sToolTipText).arg(exe));
pcAction->setStatusTip(QCoreApplication::translate(
this->className(), sStatusTip, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sStatusTip).arg(exe));
pcAction->setWhatsThis(QLatin1String(sWhatsThis));
pcAction->setIcon(QApplication::windowIcon());
pcAction->setShortcut(QString::fromLatin1(sAccel));
Expand Down Expand Up @@ -234,14 +231,11 @@ void StdCmdAbout::languageChange()
if (_pcAction) {
QString exe = qApp->applicationName();
_pcAction->setText(QCoreApplication::translate(
this->className(), sMenuText, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sMenuText).arg(exe));
_pcAction->setToolTip(QCoreApplication::translate(
this->className(), sToolTipText, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sToolTipText).arg(exe));
_pcAction->setStatusTip(QCoreApplication::translate(
this->className(), sStatusTip, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sStatusTip).arg(exe));
_pcAction->setWhatsThis(QLatin1String(sWhatsThis));
}
}
Expand Down
33 changes: 11 additions & 22 deletions src/Gui/CommandView.cpp
View file
Expand Up @@ -615,39 +615,29 @@ void StdCmdDrawStyle::languageChange()
QList<QAction*> a = pcAction->actions();

a[0]->setText(QCoreApplication::translate(
"Std_DrawStyle", "As is", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "As is"));
a[0]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Normal mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Normal mode"));

a[1]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Flat lines"));
a[1]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Flat lines mode"));

a[2]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Shaded", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Shaded"));
a[2]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Shaded mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Shaded mode"));

a[3]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Wireframe"));
a[3]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Wireframe mode"));

a[4]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Points", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Points"));
a[4]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Points mode", 0,
QCoreApplication::CodecForTr));
"Std_DrawStyle", "Points mode"));
}

void StdCmdDrawStyle::updateIcon(const MDIView *view)
Expand Down Expand Up @@ -1453,8 +1443,7 @@ Action * StdViewDockUndockFullscreen::createAction(void)
ActionGroup* pcAction = new ActionGroup(this, getMainWindow());
pcAction->setDropDownMenu(true);
pcAction->setText(QCoreApplication::translate(
this->className(), sMenuText, 0,
QCoreApplication::CodecForTr));
this->className(), sMenuText));

CommandManager &rcCmdMgr = Application::Instance->commandManager();
Command* cmdD = rcCmdMgr.getCommandByName("Std_ViewDock");
Expand Down
9 changes: 3 additions & 6 deletions src/Gui/CommandWindow.cpp
View file
Expand Up @@ -440,14 +440,11 @@ Action * StdCmdWindowsMenu::createAction(void)
QAction* window = pcAction->addAction(QObject::tr(sToolTipText));
window->setCheckable(true);
window->setToolTip(QCoreApplication::translate(
this->className(), sToolTipText, 0,
QCoreApplication::CodecForTr));
this->className(), sToolTipText));
window->setStatusTip(QCoreApplication::translate(
this->className(), sStatusTip, 0,
QCoreApplication::CodecForTr));
this->className(), sStatusTip));
window->setWhatsThis(QCoreApplication::translate(
this->className(), sWhatsThis, 0,
QCoreApplication::CodecForTr));
this->className(), sWhatsThis));
}

QAction* sep = pcAction->addAction(QLatin1String(""));
Expand Down
8 changes: 4 additions & 4 deletions src/Gui/DlgKeyboardImp.cpp
View file
Expand Up @@ -226,7 +226,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
// update the tool tip
QString accel = shortcut.toString(QKeySequence::NativeText);
QString toolTip = QCoreApplication::translate(cmd->className(),
cmd->getToolTipText(), 0, QCoreApplication::UnicodeUTF8);
cmd->getToolTipText());
if (!accel.isEmpty()) {
if (!toolTip.isEmpty()) {
QString tip = QString::fromLatin1("%1 (%2)")
Expand All @@ -240,7 +240,7 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()

// update the status tip
QString statusTip = QCoreApplication::translate(cmd->className(),
cmd->getStatusTip(), 0, QCoreApplication::UnicodeUTF8);
cmd->getStatusTip());
if (statusTip.isEmpty())
statusTip = toolTip;
if (!accel.isEmpty()) {
Expand Down Expand Up @@ -281,12 +281,12 @@ void DlgCustomKeyboardImp::on_buttonClear_clicked()

// update the tool tip
QString toolTip = QCoreApplication::translate(cmd->className(),
cmd->getToolTipText(), 0, QCoreApplication::UnicodeUTF8);
cmd->getToolTipText());
action->setToolTip(toolTip);

// update the status tip
QString statusTip = QCoreApplication::translate(cmd->className(),
cmd->getStatusTip(), 0, QCoreApplication::UnicodeUTF8);
cmd->getStatusTip());
if (statusTip.isEmpty())
statusTip = toolTip;
action->setStatusTip(statusTip);
Expand Down
42 changes: 16 additions & 26 deletions src/Gui/InputVector.h
View file
Expand Up @@ -127,11 +127,10 @@ class LocationInterface : public LocationDialog, public Ui

if (this->direction->count() == 0) {
this->direction->insertItems(0, QStringList()
<< QApplication::translate("Gui::LocationDialog", "X", 0, QApplication::UnicodeUTF8)
<< QApplication::translate("Gui::LocationDialog", "Y", 0, QApplication::UnicodeUTF8)
<< QApplication::translate("Gui::LocationDialog", "Z", 0, QApplication::UnicodeUTF8)
<< QApplication::translate("Gui::LocationDialog", "User defined...", 0,
QApplication::UnicodeUTF8)
<< QApplication::translate("Gui::LocationDialog", "X")
<< QApplication::translate("Gui::LocationDialog", "Y")
<< QApplication::translate("Gui::LocationDialog", "Z")
<< QApplication::translate("Gui::LocationDialog", "User defined...")
);

this->direction->setCurrentIndex(2);
Expand All @@ -142,15 +141,11 @@ class LocationInterface : public LocationDialog, public Ui
this->direction->setItemData(2, QVariant::fromValue<Base::Vector3d>(Base::Vector3d(0,0,1)));
}
else {
this->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X", 0,
QApplication::UnicodeUTF8));
this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y", 0,
QApplication::UnicodeUTF8));
this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z", 0,
QApplication::UnicodeUTF8));
this->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X"));
this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y"));
this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z"));
this->direction->setItemText(this->direction->count()-1,
QApplication::translate("Gui::LocationDialog", "User defined...", 0,
QApplication::UnicodeUTF8));
QApplication::translate("Gui::LocationDialog", "User defined..."));
}
}

Expand Down Expand Up @@ -249,11 +244,10 @@ class LocationInterfaceComp : public Ui

if (this->direction->count() == 0) {
this->direction->insertItems(0, QStringList()
<< QApplication::translate("Gui::LocationDialog", "X", 0, QApplication::UnicodeUTF8)
<< QApplication::translate("Gui::LocationDialog", "Y", 0, QApplication::UnicodeUTF8)
<< QApplication::translate("Gui::LocationDialog", "Z", 0, QApplication::UnicodeUTF8)
<< QApplication::translate("Gui::LocationDialog", "User defined...", 0,
QApplication::UnicodeUTF8)
<< QApplication::translate("Gui::LocationDialog", "X")
<< QApplication::translate("Gui::LocationDialog", "Y")
<< QApplication::translate("Gui::LocationDialog", "Z")
<< QApplication::translate("Gui::LocationDialog", "User defined...")
);

this->direction->setCurrentIndex(2);
Expand All @@ -264,15 +258,11 @@ class LocationInterfaceComp : public Ui
this->direction->setItemData(2, QVariant::fromValue<Base::Vector3d>(Base::Vector3d(0,0,1)));
}
else {
this->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X", 0,
QApplication::UnicodeUTF8));
this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y", 0,
QApplication::UnicodeUTF8));
this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z", 0,
QApplication::UnicodeUTF8));
this->direction->setItemText(0, QApplication::translate("Gui::LocationDialog", "X"));
this->direction->setItemText(1, QApplication::translate("Gui::LocationDialog", "Y"));
this->direction->setItemText(2, QApplication::translate("Gui::LocationDialog", "Z"));
this->direction->setItemText(this->direction->count()-1,
QApplication::translate("Gui::LocationDialog", "User defined...", 0,
QApplication::UnicodeUTF8));
QApplication::translate("Gui::LocationDialog", "User defined..."));
}
}

Expand Down
14 changes: 5 additions & 9 deletions src/Gui/MenuManager.cpp
View file
Expand Up @@ -22,7 +22,7 @@


#include "PreCompiled.h"
#ifndef _PreComp_
#ifndef _PreComp_
# include <QApplication>
# include <QMenu>
# include <QMenuBar>
Expand Down Expand Up @@ -210,8 +210,7 @@ void MenuManager::setup(MenuItem* menuItems) const
// create a new menu
std::string menuName = (*it)->command();
QMenu* menu = menuBar->addMenu(
QApplication::translate("Workbench", menuName.c_str(),
0, QApplication::UnicodeUTF8));
QApplication::translate("Workbench", menuName.c_str()));
action = menu->menuAction();
menu->setObjectName(QString::fromLatin1(menuName.c_str()));
action->setObjectName(QString::fromLatin1(menuName.c_str()));
Expand Down Expand Up @@ -264,8 +263,7 @@ void MenuManager::setup(MenuItem* item, QMenu* menu) const
// Creste a submenu
std::string menuName = (*it)->command();
QMenu* submenu = menu->addMenu(
QApplication::translate("Workbench", menuName.c_str(),
0, QApplication::UnicodeUTF8));
QApplication::translate("Workbench", menuName.c_str()));
QAction* action = submenu->menuAction();
submenu->setObjectName(QString::fromLatin1((*it)->command().c_str()));
action->setObjectName(QString::fromLatin1((*it)->command().c_str()));
Expand Down Expand Up @@ -334,14 +332,12 @@ void MenuManager::retranslate(QMenu* menu) const
if (cmd) {
menu->setTitle(
QApplication::translate(cmd->className(),
cmd->getMenuText(),
0, QCoreApplication::CodecForTr));
cmd->getMenuText()));
}
else {
menu->setTitle(
QApplication::translate("Workbench",
(const char*)menuName,
0, QApplication::UnicodeUTF8));
(const char*)menuName));
}
QList<QAction*> actions = menu->actions();
for (QList<QAction*>::Iterator it = actions.begin(); it != actions.end(); ++it) {
Expand Down
27 changes: 9 additions & 18 deletions src/Gui/NetworkRetriever.cpp
View file
Expand Up @@ -419,17 +419,13 @@ Action * StdCmdDownloadOnlineHelp::createAction(void)
QString exe = QString::fromLatin1(App::GetApplication().getExecutableName());
pcAction = new Action(this,getMainWindow());
pcAction->setText(QCoreApplication::translate(
this->className(), sMenuText, 0,
QCoreApplication::CodecForTr));
this->className(), sMenuText));
pcAction->setToolTip(QCoreApplication::translate(
this->className(), sToolTipText, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sToolTipText).arg(exe));
pcAction->setStatusTip(QCoreApplication::translate(
this->className(), sStatusTip, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sStatusTip).arg(exe));
pcAction->setWhatsThis(QCoreApplication::translate(
this->className(), sWhatsThis, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sWhatsThis).arg(exe));
pcAction->setIcon(Gui::BitmapFactory().pixmap(sPixmap));
pcAction->setShortcut(QString::fromLatin1(sAccel));

Expand All @@ -441,17 +437,13 @@ void StdCmdDownloadOnlineHelp::languageChange()
if (_pcAction) {
QString exe = QString::fromLatin1(App::GetApplication().getExecutableName());
_pcAction->setText(QCoreApplication::translate(
this->className(), sMenuText, 0,
QCoreApplication::CodecForTr));
this->className(), sMenuText));
_pcAction->setToolTip(QCoreApplication::translate(
this->className(), sToolTipText, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sToolTipText).arg(exe));
_pcAction->setStatusTip(QCoreApplication::translate(
this->className(), sStatusTip, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sStatusTip).arg(exe));
_pcAction->setWhatsThis(QCoreApplication::translate(
this->className(), sWhatsThis, 0,
QCoreApplication::CodecForTr).arg(exe));
this->className(), sWhatsThis).arg(exe));
}
}

Expand Down Expand Up @@ -556,8 +548,7 @@ void StdCmdDownloadOnlineHelp::wgetFinished()
{
if (_pcAction)
_pcAction->setText(QCoreApplication::translate(
this->className(), sMenuText, 0,
QCoreApplication::CodecForTr));
this->className(), sMenuText));
}

#include "moc_NetworkRetriever.cpp"
Expand Down
8 changes: 3 additions & 5 deletions src/Gui/ToolBarManager.cpp
View file
Expand Up @@ -22,7 +22,7 @@


#include "PreCompiled.h"
#ifndef _PreComp_
#ifndef _PreComp_
# include <QApplication>
# include <QAction>
# include <QToolBar>
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
}

Expand Down

0 comments on commit d2cb4e4

Please sign in to comment.