r22610 by jghali - fix build error

[scribus-commit]

Author: jghali
Date: Sun Aug  5 11:42:46 2018
New Revision: 22610

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22610
Log:
fix build error

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

Modified: trunk/Scribus/scribus/scribusXml.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22610&path=/trunk/Scribus/scribus/scribusXml.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusXml.cpp        (original)
+++ trunk/Scribus/scribus/scribusXml.cpp        Sun Aug  5 11:42:46 2018
@@ -66,7 +66,7 @@
 {
 }
 
-bool ScriXmlDoc::ReadElemHeader(QString file, bool isFile, double *x, double 
*y, double *w, double *h)
+bool ScriXmlDoc::ReadElemHeader(const QString& file, bool isFile, double *x, 
double *y, double *w, double *h)
 {
        QString ff = "";
        if (isFile)
@@ -110,14 +110,14 @@
        return (succeed && !sReader.hasError());
 }
 
-bool ScriXmlDoc::ReadElem(QString fileNameOrData, SCFonts &avail, ScribusDoc 
*doc, double xPos, double yPos, bool isDataFromFile, bool loc, 
QMap<QString,QString> &FontSub)
+bool ScriXmlDoc::ReadElem(const QString& fileNameOrData, SCFonts &avail, 
ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool loc, 
QMap<QString,QString> &FontSub)
 {
        // Do not suppose the existence of layer with id = 0
        // return ReadElemToLayer(fileName, avail, doc, Xp, Yp, Fi, loc, 
FontSub, view, 0);
        return ReadElemToLayer(fileNameOrData, avail, doc, xPos, yPos, 
isDataFromFile, loc, FontSub, doc->activeLayer());
 }
 
-bool ScriXmlDoc::ReadElemToLayer(QString fileNameOrData, SCFonts &avail, 
ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool loc, 
QMap<QString,QString> &FontSub, int toLayer)
+bool ScriXmlDoc::ReadElemToLayer(const QString& fileNameOrData, SCFonts 
&avail, ScribusDoc *doc, double xPos, double yPos, bool isDataFromFile, bool 
loc, QMap<QString,QString> &FontSub, int toLayer)
 {
        QString elementData;
        QString fileDir = ScPaths::applicationDataDir();

Modified: trunk/Scribus/scribus/ui/colorlistbox.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22610&path=/trunk/Scribus/scribus/ui/colorlistbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/colorlistbox.cpp   (original)
+++ trunk/Scribus/scribus/ui/colorlistbox.cpp   Sun Aug  5 11:42:46 2018
@@ -42,7 +42,7 @@
        return *this;
 }
 
-ColorPixmapValue::ColorPixmapValue( const ScColor& col, ScribusDoc* doc, const 
QString colName ) 
+ColorPixmapValue::ColorPixmapValue( const ScColor& col, ScribusDoc* doc, const 
QString& colName ) 
 {
        m_doc = (doc) ? doc->guardedPtr() : nullptr;
        m_color = col;
@@ -348,7 +348,7 @@
        return this->selectionModel()->hasSelection();
 }
 
-void ColorListBox::insertItem(int row, const ScColor& color, QString colorName)
+void ColorListBox::insertItem(int row, const ScColor& color, const QString& 
colorName)
 {
        ColorListModel* colorListModel = dynamic_cast<ColorListModel*>(model());
        if (!colorListModel)
@@ -379,7 +379,7 @@
        model()->removeRow(i);
 }
 
-int ColorListBox::row(QString colorName)
+int ColorListBox::row(const QString& colorName)
 {
        QAbstractItemModel* currentModel = model();
 


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit