diff --git a/src/part/dot2qtconsts.cpp b/src/part/dot2qtconsts.cpp --- a/src/part/dot2qtconsts.cpp +++ b/src/part/dot2qtconsts.cpp @@ -855,32 +855,27 @@ QColor Dot2QtConsts::qtColor(const QString &dotColor) const { - // () << "Dot2QtConsts::qtColor"; QColor color; if (parse_numeric_color(qPrintable(dotColor), color)) { return color; - } else { - if (m_qcolors.find(dotColor) != m_qcolors.end()) { - return (*m_qcolors.find(dotColor)); - } - QColor res(dotColor); + } + if (m_qcolors.find(dotColor) != m_qcolors.end()) { + return (*m_qcolors.find(dotColor)); + } + QColor res(dotColor); + if (res.isValid()) { + return res; + } + + if (m_colors.find(dotColor) != m_colors.end()) { + res = QColor((*m_colors.find(dotColor))); if (res.isValid()) { return res; - } else { - if (m_colors.find(dotColor) != m_colors.end()) { - res = QColor((*m_colors.find(dotColor))); - if (res.isValid()) { - return res; - } else { - qCWarning(KGRAPHVIEWERLIB_LOG) << "Unknown stored DOT color '" << dotColor << "'. returning Qt black"; - return Qt::black; - } - } else { - // qCWarning(KGRAPHVIEWERLIB_LOG) << "Unknown DOT color '" << dotColor << "'. returning Qt black"; - return Qt::black; - } } } + + qCWarning(KGRAPHVIEWERLIB_LOG) << "Unknown stored DOT color '" << dotColor << "'. returning black"; + return Qt::black; } Qt::PenStyle Dot2QtConsts::qtPenStyle(const QString &dotLineStyle) const