colorpixmapvalue.diff (2,045 bytes)
diff --git a/scribus/ui/colorlistbox.cpp b/scribus/ui/colorlistbox.cpp
index 21400fc69..cd38ae487 100644
--- a/scribus/ui/colorlistbox.cpp
+++ b/scribus/ui/colorlistbox.cpp
@@ -26,31 +26,6 @@ for which a new license (GPL+exception) is in place.
#include "scribusdoc.h"
#include "util_color.h"
-
-
-ColorPixmapValue::ColorPixmapValue() : m_doc(nullptr), m_name("invalid")
-{}
-
-ColorPixmapValue::ColorPixmapValue(const ColorPixmapValue& other) : m_color(other.m_color), m_doc(other.m_doc), m_name(other.m_name)
-{}
-
-ColorPixmapValue& ColorPixmapValue::operator= (const ColorPixmapValue& other)
-{
- m_color = other.m_color;
- m_doc = other.m_doc;
- m_name = other.m_name;
- return *this;
-}
-
-ColorPixmapValue::ColorPixmapValue( const ScColor& col, ScribusDoc* doc, const QString& colName )
-{
- m_doc = (doc) ? doc->guardedPtr() : nullptr;
- m_color = col;
- m_name = colName;
-}
-
-
-
class SCRIBUS_API ColorSmallItemDelegate : public ScListBoxPixmap<15,15>
{
public:
diff --git a/scribus/ui/colorlistmodel.cpp b/scribus/ui/colorlistmodel.cpp
index a4905a59f..f54714075 100644
--- a/scribus/ui/colorlistmodel.cpp
+++ b/scribus/ui/colorlistmodel.cpp
@@ -10,6 +10,27 @@ for which a new license (GPL+exception) is in place.
#include "colorlistbox.h"
#include "commonstrings.h"
+ColorPixmapValue::ColorPixmapValue() : m_doc(nullptr), m_name("invalid")
+{}
+
+ColorPixmapValue::ColorPixmapValue(const ColorPixmapValue& other) : m_color(other.m_color), m_doc(other.m_doc), m_name(other.m_name)
+{}
+
+ColorPixmapValue& ColorPixmapValue::operator= (const ColorPixmapValue& other)
+{
+ m_color = other.m_color;
+ m_doc = other.m_doc;
+ m_name = other.m_name;
+ return *this;
+}
+
+ColorPixmapValue::ColorPixmapValue( const ScColor& col, ScribusDoc* doc, const QString& colName )
+{
+ m_doc = (doc) ? doc->guardedPtr() : nullptr;
+ m_color = col;
+ m_name = colName;
+}
+
ColorPixmapValue ColorListModel::m_NoneColor(ScColor(), nullptr, CommonStrings::None);
ColorListModel::ColorListModel(QObject *parent)