32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
diff --git a/scribus/ui/colorlistmodel.cpp b/scribus/ui/colorlistmodel.cpp
|
|
index a4905a5..8363e97 100644
|
|
--- a/scribus/ui/colorlistmodel.cpp
|
|
+++ b/scribus/ui/colorlistmodel.cpp
|
|
@@ -10,8 +10,6 @@ for which a new license (GPL+exception) is in place.
|
|
#include "colorlistbox.h"
|
|
#include "commonstrings.h"
|
|
|
|
-ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None);
|
|
-
|
|
ColorListModel::ColorListModel(QObject *parent)
|
|
: QAbstractItemModel(parent)
|
|
{
|
|
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
|