r22475 by craig - Minor code fixes

[scribus-commit]

Author: craig
Date: Mon Apr 23 20:20:21 2018
New Revision: 22475

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22475
Log:
Minor code fixes

Modified:
    trunk/Scribus/scribus/ui/colorsandfills.cpp
    trunk/Scribus/scribus/ui/colorsandfills.h

Modified: trunk/Scribus/scribus/ui/colorsandfills.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22475&path=/trunk/Scribus/scribus/ui/colorsandfills.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.cpp	(original)
+++ trunk/Scribus/scribus/ui/colorsandfills.cpp	Mon Apr 23 20:20:21 2018
@@ -66,7 +66,7 @@
 #include "util_formats.h"
 
 
-ColorsAndFillsDialog::ColorsAndFillsDialog(QWidget* parent, QHash<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QHash<QString, ScPattern> *docPatterns, ScribusDoc *doc, ScribusMainWindow *scMW) : QDialog(parent)
+ColorsAndFillsDialog::ColorsAndFillsDialog(QWidget* parent, QHash<QString, VGradient> *docGradients, ColorList doco, const QString& docColSet, QHash<QString, ScPattern> *docPatterns, ScribusDoc *doc, ScribusMainWindow *scMW) : QDialog(parent)
 {
 	setupUi(this);
 	setModal(true);
@@ -120,7 +120,7 @@
 	{
 		if (docColSet != "Scribus Small")
 		{
-			QString pfad = "";
+			QString pfad;
 			if (customColSet.contains(docColSet))
 				pfad = csm.userPaletteFileFromName(docColSet);
 			else
@@ -507,7 +507,7 @@
 		{
 			QString gradN = it->text(0);
 			QString patternName = origNames[it->text(0)];
-			QString newName = "";
+			QString newName;
 			gradientEditDialog *dia = new gradientEditDialog(this, gradN, dialogGradients[gradN], m_colorList, m_doc, &dialogGradients, false);
 			if (dia->exec())
 			{

Modified: trunk/Scribus/scribus/ui/colorsandfills.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22475&path=/trunk/Scribus/scribus/ui/colorsandfills.h
==============================================================================
--- trunk/Scribus/scribus/ui/colorsandfills.h	(original)
+++ trunk/Scribus/scribus/ui/colorsandfills.h	Mon Apr 23 20:20:21 2018
@@ -40,7 +40,7 @@
 	Q_OBJECT
 
 	public:
-		ColorsAndFillsDialog(QWidget* parent, QHash<QString, VGradient> *docGradients, ColorList doco, QString docColSet, QHash<QString, ScPattern> *docPatterns, ScribusDoc *doc, ScribusMainWindow* scMW);
+		ColorsAndFillsDialog(QWidget* parent, QHash<QString, VGradient> *docGradients, ColorList doco, const QString& docColSet, QHash<QString, ScPattern> *docPatterns, ScribusDoc *doc, ScribusMainWindow* scMW);
 		~ColorsAndFillsDialog() {}
 		/*! \brief Returns the name of the current/selected color set.
 		\retval QString selected name. */