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 
+ change inheritance of PropertyItem to not derive from BaseClass (and QObject) any more to fix crashes with Qt5
This commit is contained in:
wmayer
2016-12-12 17:01:26 +01:00
parent e20a054328
commit 3357cd91e7
9 changed files with 136 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/Gui/PropertyFemMeshItem.cpp
View File

@@ -33,7 +33,7 @@
using namespace FemGui;
TYPESYSTEM_SOURCE(FemGui::PropertyFemMeshItem, Gui::PropertyEditor::PropertyItem);
PROPERTYITEM_SOURCE(FemGui::PropertyFemMeshItem)
PropertyFemMeshItem::PropertyFemMeshItem()
{

2
src/Mod/Fem/Gui/PropertyFemMeshItem.h
View File

@@ -41,7 +41,7 @@ class PropertyFemMeshItem : public Gui::PropertyEditor::PropertyItem
Q_PROPERTY(int Volumes READ countVolumes)
Q_PROPERTY(int Polyhedrons READ countPolyhedrons)
Q_PROPERTY(int Groups READ countGroups)
TYPESYSTEM_HEADER();
PROPERTYITEM_HEADER
virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const;
virtual void setEditorData(QWidget *editor, const QVariant& data) const;

2
src/Mod/Mesh/Gui/PropertyEditorMesh.cpp
View File

@@ -33,7 +33,7 @@ using namespace MeshGui;
using MeshCore::MeshKernel;
TYPESYSTEM_SOURCE(MeshGui::PropertyMeshKernelItem, Gui::PropertyEditor::PropertyItem);
PROPERTYITEM_SOURCE(MeshGui::PropertyMeshKernelItem)
PropertyMeshKernelItem::PropertyMeshKernelItem()
{

2
src/Mod/Mesh/Gui/PropertyEditorMesh.h
View File

@@ -37,7 +37,7 @@ class MeshGuiExport PropertyMeshKernelItem : public Gui::PropertyEditor::Propert
Q_PROPERTY(int Points READ countPoints)
Q_PROPERTY(int Edges READ countEdges)
Q_PROPERTY(int Faces READ countFaces)
TYPESYSTEM_HEADER();
PROPERTYITEM_HEADER
virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const;
virtual void setEditorData(QWidget *editor, const QVariant& data) const;

2
src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp
View File

@@ -36,7 +36,7 @@
using namespace SketcherGui;
using namespace Gui::PropertyEditor;
TYPESYSTEM_SOURCE(SketcherGui::PropertyConstraintListItem, Gui::PropertyEditor::PropertyItem)
PROPERTYITEM_SOURCE(SketcherGui::PropertyConstraintListItem)
PropertyConstraintListItem::PropertyConstraintListItem()
{

2
src/Mod/Sketcher/Gui/PropertyConstraintListItem.h
View File

@@ -43,7 +43,7 @@ namespace SketcherGui {
class PropertyConstraintListItem: public Gui::PropertyEditor::PropertyItem
{
Q_OBJECT
TYPESYSTEM_HEADER();
PROPERTYITEM_HEADER
virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const;
virtual void setEditorData(QWidget *editor, const QVariant& data) const;