diff --git a/scribus/ui/colorlistmodel.h b/scribus/ui/colorlistmodel.h index 8f5bc65..892d0a7 100644 --- a/scribus/ui/colorlistmodel.h +++ b/scribus/ui/colorlistmodel.h @@ -103,12 +103,9 @@ protected: // SortRule m_sortRule SortRule m_sortRule; - //! Dummy object used to represent None Color - static ColorPixmapValue m_NoneColor; - static bool compareColorNames(const ColorPixmapValue& v1, const ColorPixmapValue& v2); static bool compareColorValues(const ColorPixmapValue& v1, const ColorPixmapValue& v2); static bool compareColorTypes(const ColorPixmapValue& v1, const ColorPixmapValue& v2); }; -#endif // COLORLISTMODEL_H \ No newline at end of file +#endif // COLORLISTMODEL_H diff -up scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp.orig scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp --- scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp.orig 2020-12-07 10:58:06.108966263 +0100 +++ scribus-1.5.6.1/scribus/ui/colorlistmodel.cpp 2020-12-07 10:58:11.058358432 +0100 @@ -31,8 +31,6 @@ ColorPixmapValue::ColorPixmapValue( cons m_name = colName; } -ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None); - ColorListModel::ColorListModel(QObject *parent) : QAbstractItemModel(parent) {