suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -Wunused-private-field, -Woverloaded-virtual

Browse Source
This commit is contained in:
wmayer 2017-03-05 10:08:17 +01:00
parent 1ee6dcf75e
commit 45bf8ed91e
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Gui/Quarter/EventFilter.cpp
View File

@ -85,9 +85,6 @@ public:
device->setMousePosition(mousepos);
}
}
private:
qreal device_pixel_ratio = 1.0;
};
#define PRIVATE(obj) obj->pimpl

14
src/Gui/propertyeditor/PropertyItem.cpp
View File

@ -3511,6 +3511,19 @@ PropertyItemEditorFactory::~PropertyItemEditorFactory()
{
}
#if (QT_VERSION >= 0x050300)
QWidget * PropertyItemEditorFactory::createEditor (int /*type*/, QWidget * /*parent*/) const
{
// do not allow to create any editor widgets because we do that in subclasses of PropertyItem
return 0;
}
QByteArray PropertyItemEditorFactory::valuePropertyName (int /*type*/) const
{
// do not allow to set properties because we do that in subclasses of PropertyItem
return "";
}
#else
QWidget * PropertyItemEditorFactory::createEditor (QVariant::Type /*type*/, QWidget * /*parent*/) const
{
// do not allow to create any editor widgets because we do that in subclasses of PropertyItem
@ -3522,6 +3535,7 @@ QByteArray PropertyItemEditorFactory::valuePropertyName (QVariant::Type /*type*/
// do not allow to set properties because we do that in subclasses of PropertyItem
return "";
}
#endif
#include "moc_PropertyItem.cpp"

9
src/Gui/propertyeditor/PropertyItem.h
View File

@ -945,8 +945,13 @@ public:
PropertyItemEditorFactory();
virtual ~PropertyItemEditorFactory();
virtual QWidget * createEditor ( QVariant::Type type, QWidget * parent ) const;
virtual QByteArray valuePropertyName ( QVariant::Type type ) const;
#if (QT_VERSION >= 0x050300)
virtual QWidget *createEditor(int userType, QWidget *parent) const;
virtual QByteArray valuePropertyName(int userType) const;
#else
virtual QWidget * createEditor(QVariant::Type type, QWidget * parent) const;
virtual QByteArray valuePropertyName (QVariant::Type type) const;
#endif
};
} // namespace PropertyEditor