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

can't assign nullptr to a QPixmap

Browse Source
This commit is contained in:
wmayer 2017-01-30 14:13:57 +01:00
parent 303f0886df
commit 64d0eb95f3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/TechDraw/Gui/QGIFace.cpp
View File

@ -78,7 +78,7 @@ QGIFace::QGIFace(int index) :
setLineWeight(0.5); //0 = cosmetic setLineWeight(0.5); //0 = cosmetic
setPrettyNormal(); setPrettyNormal();
m_texture = nullptr; //empty texture m_texture = QPixmap(); //empty texture
m_svg = new QGCustomSvg(); m_svg = new QGCustomSvg();
@ -101,7 +101,7 @@ void QGIFace::draw()
if (isHatched()) { if (isHatched()) {
if (m_mode == GeomHatchFill) { //crosshatch if (m_mode == GeomHatchFill) { //crosshatch
if (!m_geomHatchPaths.empty()) { //surrogate for LineSets.empty if (!m_geomHatchPaths.empty()) { //surrogate for LineSets.empty
m_brush.setTexture(nullptr); m_brush.setTexture(QPixmap());
m_fillStyle = m_styleDef; m_fillStyle = m_styleDef;
m_styleNormal = m_fillStyle; m_styleNormal = m_fillStyle;
int pathNo = 0; int pathNo = 0;
@ -121,7 +121,7 @@ void QGIFace::draw()
QString ext = hfi.suffix(); QString ext = hfi.suffix();
if (ext.toUpper() == QString::fromUtf8("SVG")) { if (ext.toUpper() == QString::fromUtf8("SVG")) {
setFillMode(SvgFill); setFillMode(SvgFill);
m_brush.setTexture(nullptr); m_brush.setTexture(QPixmap());
m_fillStyle = m_styleDef; m_fillStyle = m_styleDef;
m_styleNormal = m_fillStyle; m_styleNormal = m_fillStyle;
loadSvgHatch(m_fileSpec); loadSvgHatch(m_fileSpec);
@ -150,7 +150,7 @@ void QGIFace::setPrettyNormal() {
m_brush.setTexture(m_texture); m_brush.setTexture(m_texture);
} else { } else {
m_fillStyle = m_styleNormal; m_fillStyle = m_styleNormal;
m_brush.setTexture(nullptr); m_brush.setTexture(QPixmap());
m_brush.setStyle(m_fillStyle); m_brush.setStyle(m_fillStyle);
m_fillColor = m_colNormalFill; m_fillColor = m_colNormalFill;
} }
@ -158,14 +158,14 @@ void QGIFace::setPrettyNormal() {
} }
void QGIFace::setPrettyPre() { void QGIFace::setPrettyPre() {
m_brush.setTexture(nullptr); m_brush.setTexture(QPixmap());
m_fillStyle = m_styleSelect; m_fillStyle = m_styleSelect;
m_fillColor = getPreColor(); m_fillColor = getPreColor();
QGIPrimPath::setPrettyPre(); QGIPrimPath::setPrettyPre();
} }
void QGIFace::setPrettySel() { void QGIFace::setPrettySel() {
m_brush.setTexture(nullptr); m_brush.setTexture(QPixmap());
m_fillStyle = m_styleSelect; m_fillStyle = m_styleSelect;
m_fillColor = getSelectColor(); m_fillColor = getSelectColor();
QGIPrimPath::setPrettySel(); QGIPrimPath::setPrettySel();