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

Qt4/Qt5 neutral changes:

Browse Source 
+ 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
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Gui/InputVector.h
View File

@@ -127,11 +127,10 @@ public:
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);
@@ -142,15 +141,11 @@ public:
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..."));
}
}
@@ -249,11 +244,10 @@ public:
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);
@@ -264,15 +258,11 @@ public:
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..."));
}
}