View Issue Details

IDProjectCategoryView StatusLast Update
0015930ScribusInternalpublic2019-11-08 08:10
Reporterale Assigned Toale  
PrioritynormalSeverityminorReproducibilityhave not tried
Status resolvedResolutionfixed 
Product Version 
Target VersionFixed in Version1.5.6.svn 
Summary0015930: ColorPixmapValue is defined in ui/colorlistmodel.h and implemented in ui/colorlistbox.cpp
Descriptionshouldn't ColorPixmapValue be implemented in ui/colorlistmodel.cpp ?
TagsNo tags attached.
PatchYes

Activities

ale

2019-11-08 07:22

manager  

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)
colorpixmapvalue.diff (2,045 bytes)

Issue History

Date Modified Username Field Change
2019-11-08 07:22 ale New Issue
2019-11-08 07:22 ale File Added: colorpixmapvalue.diff
2019-11-08 08:09 jghali Category Build System => Internal
2019-11-08 08:09 jghali Summary [PATCH] ColorPixmapValue is defined in ui/colorlistmodel.h and implemented in ui/colorlistbox.cpp => ColorPixmapValue is defined in ui/colorlistmodel.h and implemented in ui/colorlistbox.cpp
2019-11-08 08:10 jghali Assigned To => ale
2019-11-08 08:10 jghali Status new => resolved
2019-11-08 08:10 jghali Resolution open => fixed
2019-11-08 08:10 jghali Fixed in Version => 1.5.6.svn