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

Extensions: Fix rebase errors

Browse Source
This commit is contained in:
Stefan Tröger
2016-08-25 17:50:31 +02:00
committed by wmayer
parent cdd33738bb
commit 2a61aec97b
7 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/App/Application.cpp
View File

@@ -1137,11 +1137,14 @@ void Application::initTypes(void)
// Extension classes
App ::Extension ::init();
App ::ExtensionContainer ::init();
App ::DocumentObjectExtension ::init();
App ::GroupExtension ::init();
App ::GroupExtensionPython ::init();
App ::GeoFeatureGroupExtension ::init();
App ::GeoFeatureGroupExtensionPython::init();
App ::OriginGroupExtension ::init();
App ::OriginGroupExtensionPython::init();
// Document classes
App ::TransactionalObject ::init();

2
src/App/DocumentObjectGroup.cpp
View File

@@ -61,7 +61,7 @@ namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(App::DocumentObjectGroupPython, App::DocumentObjectGroup)
template<> const char* App::DocumentObjectGroupPython::getViewProviderName(void) const {
return "Gui::ViewProviderGroupExtensionPython";
return "Gui::ViewProviderDocumentObjectGroupPython";
}
template<> PyObject* App::DocumentObjectGroupPython::getPyObject(void) {
if (PythonObject.is(Py::_None())) {

5
src/App/PropertyFile.cpp
View File

@@ -89,8 +89,9 @@ std::string PropertyFileIncluded::getDocTransientPath(void) const
{
std::string path;
PropertyContainer *co = getContainer();
if (co->isDerivedFrom(DocumentObject::getClassTypeId())) {
path = static_cast<DocumentObject*>(co)->getDocument()->TransientDir.getValue();
auto obj = dynamic_cast<DocumentObject*>(co);
if (obj) {
path = obj->getDocument()->TransientDir.getValue();
std::replace(path.begin(), path.end(), '\\', '/');
}
return path;