r23345 by jghali - #15930: ColorPixmapValue is defined in ui/colorlistmodel.h and implemented in ui/colorlistbox.cpp ale)

[scribus-commit]

Author: jghali
Date: Fri Nov  8 08:09:21 2019
New Revision: 23345

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23345
Log:
#15930: ColorPixmapValue is defined in ui/colorlistmodel.h and implemented in ui/colorlistbox.cpp ale)

Modified:
    trunk/Scribus/scribus/ui/colorlistbox.cpp
    trunk/Scribus/scribus/ui/colorlistmodel.cpp

Modified: trunk/Scribus/scribus/ui/colorlistbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23345&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorlistbox.cpp	Fri Nov  8 08:09:21 2019
@@ -25,31 +25,6 @@
 #include "scconfig.h"
 #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>
 {

Modified: trunk/Scribus/scribus/ui/colorlistmodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23345&path=/trunk/Scribus/scribus/ui/colorlistmodel.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistmodel.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorlistmodel.cpp	Fri Nov  8 08:09:21 2019
@@ -9,6 +9,27 @@
 
 #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);