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

add encoding parameter to .as_std_string()

Browse Source 
to handle PyUnicode Objects. Usually ASCII for object names and Utf-8
for file names and console output.
issue #995
This commit is contained in:
Sebastian Hoogen
2015-01-31 22:36:39 +01:00
committed by wmayer
parent 6a0bcfbaee
commit d2bb75566e
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/Application.cpp
View File

@@ -998,7 +998,7 @@ bool Application::activateWorkbench(const char* name)
Py::Callable method(handler.getAttr(std::string("GetClassName")));
Py::Tuple args;
Py::String result(method.apply(args));
type = result.as_std_string();
type = result.as_std_string("ascii");
if (Base::Type::fromName(type.c_str()).isDerivedFrom(Gui::PythonBaseWorkbench::getClassTypeId())) {
Workbench* wb = WorkbenchManager::instance()->createWorkbench(name, type);
handler.setAttr(std::string("__Workbench__"), Py::Object(wb->getPyObject(), true));
@@ -1012,7 +1012,7 @@ bool Application::activateWorkbench(const char* name)
// can be defined after the call of Initialize()
if (type.empty()) {
Py::String result(method.apply(args));
type = result.as_std_string();
type = result.as_std_string("ascii");
}
}
@@ -1111,7 +1111,7 @@ QPixmap Application::workbenchIcon(const QString& wb) const
if (handler.hasAttr(std::string("Icon"))) {
Py::Object member = handler.getAttr(std::string("Icon"));
Py::String data(member);
std::string content = data.as_std_string();
std::string content = data.as_std_string("utf-8");
// test if in XPM format
QByteArray ary;
@@ -1178,7 +1178,7 @@ QString Application::workbenchToolTip(const QString& wb) const
Py::Object member = handler.getAttr(std::string("ToolTip"));
if (member.isString()) {
Py::String tip(member);
return QString::fromUtf8(tip.as_std_string().c_str());
return QString::fromUtf8(tip.as_std_string("utf-8").c_str());
}
}
catch (Py::Exception& e) {
@@ -1203,7 +1203,7 @@ QString Application::workbenchMenuText(const QString& wb) const
Py::Object member = handler.getAttr(std::string("MenuText"));
if (member.isString()) {
Py::String tip(member);
return QString::fromUtf8(tip.as_std_string().c_str());
return QString::fromUtf8(tip.as_std_string("utf-8").c_str());
}
}
catch (Py::Exception& e) {
@@ -1288,7 +1288,7 @@ void Application::setupContextMenu(const char* recipient, MenuItem* items) const
e.clear();
if (o.isString()) {
Py::String s(o);
std::clog << "Application::setupContextMenu: " << s.as_std_string() << std::endl;
std::clog << "Application::setupContextMenu: " << s.as_std_string("utf-8") << std::endl;
}
}
}