r22678 by jghali - Fix a few clang warnings

[scribus-commit]

Author: jghali
Date: Mon Sep 10 16:11:40 2018
New Revision: 22678

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22678
Log:
Fix a few clang warnings

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22678&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp	Mon Sep 10 16:11:40 2018
@@ -169,7 +169,7 @@
 	CurrColorStroke = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &shade);
 }
 
-void AnoOutputDev::drawString(GfxState *state, GooString *s)
+void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s)
 {
 	int shade = 100;
 	CurrColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);
@@ -3120,7 +3120,7 @@
 	delete image;
 }
 
-void SlaOutputDev::beginMarkedContent(char *name, Object *dictRef)
+void SlaOutputDev::beginMarkedContent(POPPLER_CONST char *name, Object *dictRef)
 {
 	mContent mSte;
 	mSte.name = QString(name);
@@ -3189,7 +3189,7 @@
 	m_mcStack.push(mSte);
 }
 
-void SlaOutputDev::beginMarkedContent(char *name, Dict *properties)
+void SlaOutputDev::beginMarkedContent(POPPLER_CONST char *name, Dict *properties)
 {
 //	qDebug() << "Begin Marked Content with Name " << QString(name);
 	QString nam = QString(name);
@@ -3316,12 +3316,12 @@
 	}
 }
 
-void SlaOutputDev::markPoint(char *name)
+void SlaOutputDev::markPoint(POPPLER_CONST char *name)
 {
 //	qDebug() << "Begin Marked Point with Name " << QString(name);
 }
 
-void SlaOutputDev::markPoint(char *name, Dict *properties)
+void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
 {
 //	qDebug() << "Begin Marked Point with Name " << QString(name) << "and Properties";
 	beginMarkedContent(name, properties);

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22678&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h	Mon Sep 10 16:11:40 2018
@@ -128,7 +128,7 @@
 	virtual void stroke(GfxState *state);
 	virtual void eoFill(GfxState *state);
 	virtual void fill(GfxState *state);
-	virtual void drawString(GfxState *state, GooString *s);
+	virtual void drawString(GfxState *state, POPPLER_CONST GooString *s);
 
 	QString CurrColorText;
 	QString CurrColorFill;
@@ -209,11 +209,11 @@
 	virtual void endMaskClip(GfxState *state) { qDebug() << "End Mask Clip"; }
 
   //----- grouping operators
-	virtual void beginMarkedContent(char *name, Dict *properties);
-	virtual void beginMarkedContent(char *name, Object *dictRef);
+	virtual void beginMarkedContent(POPPLER_CONST char *name, Dict *properties);
+	virtual void beginMarkedContent(POPPLER_CONST char *name, Object *dictRef);
 	virtual void endMarkedContent(GfxState *state);
-	virtual void markPoint(char *name);
-	virtual void markPoint(char *name, Dict *properties);
+	virtual void markPoint(POPPLER_CONST char *name);
+	virtual void markPoint(POPPLER_CONST char *name, Dict *properties);
 	//----- image drawing
 	virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg);
 	virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg);