From e20ed406111e409417d56ef16c135ec4e70c52bb Mon Sep 17 00:00:00 2001
From: Christian Hitz <christian@klarinett.li>
Date: Fri, 19 Sep 2014 10:33:44 +0200
Subject: [PATCH 01/17] silence warnings about unused variables

---
 scribus/canvasmode_magnifier.cpp              | 2 +-
 scribus/canvasmode_magnifier.h                | 2 --
 scribus/canvasmode_nodeedit.h                 | 2 +-
 scribus/canvasmode_objimport.cpp              | 3 +--
 scribus/canvasmode_objimport.h                | 1 -
 scribus/fonts/scface_ttf.cpp                  | 2 --
 scribus/gtwriter.h                            | 1 -
 scribus/loadsaveplugin.cpp                    | 1 -
 scribus/pageitem_table.cpp                    | 1 +
 scribus/plugins/gettext/odtim/stylereader.cpp | 3 +--
 scribus/plugins/gettext/odtim/stylereader.h   | 3 +--
 scribus/plugins/gettext/xtgim/xtgim.h         | 5 +----
 scribus/plugins/import/cgm/importcgm.cpp      | 8 ++++----
 scribus/plugins/import/odg/importodg.cpp      | 1 -
 scribus/plugins/import/pct/importpct.cpp      | 3 +++
 scribus/plugins/import/pdf/slaoutput.cpp      | 1 -
 scribus/plugins/import/shape/importshape.cpp  | 2 --
 scribus/plugins/picbrowser/iview.h            | 1 -
 scribus/scimgdataloader_pict.cpp              | 3 +++
 scribus/scimgdataloader_pict.h                | 2 --
 scribus/scpainter.h                           | 1 -
 scribus/scpainterex_ps2.h                     | 3 ---
 scribus/scribusdoc.cpp                        | 1 -
 scribus/serializer.cpp                        | 2 +-
 scribus/serializer.h                          | 1 -
 scribus/ui/sclistwidgetdelegate.cpp           | 2 --
 26 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/scribus/canvasmode_magnifier.cpp b/scribus/canvasmode_magnifier.cpp
index d907e28..06fca9c 100644
--- a/scribus/canvasmode_magnifier.cpp
+++ b/scribus/canvasmode_magnifier.cpp
@@ -52,7 +52,7 @@
 #include "util_math.h"
 
 
-CanvasMode_Magnifier::CanvasMode_Magnifier(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 
+CanvasMode_Magnifier::CanvasMode_Magnifier(ScribusView* view) : CanvasMode(view)
 {
 	Mxp = Myp = -1;
 	Dxp = Dyp = -1;
diff --git a/scribus/canvasmode_magnifier.h b/scribus/canvasmode_magnifier.h
index ade8eae..bd3bbc4 100644
--- a/scribus/canvasmode_magnifier.h
+++ b/scribus/canvasmode_magnifier.h
@@ -58,8 +58,6 @@ private:
 
 	double Mxp, Myp, Dxp, Dyp;
 	double SeRx, SeRy;
-	ScribusMainWindow* m_ScMW;
-	bool m_cursorVisible;
 	bool m_lastPosWasOverGuide;
 };
 
diff --git a/scribus/canvasmode_nodeedit.h b/scribus/canvasmode_nodeedit.h
index 86f20bf..05c2e3c 100644
--- a/scribus/canvasmode_nodeedit.h
+++ b/scribus/canvasmode_nodeedit.h
@@ -69,7 +69,7 @@ private:
 	ScribusMainWindow* m_ScMW;
 	
 	RectSelect* m_rectangleSelect;
-	int Mxp, Myp, Dxp, Dyp, SeRx, SeRy, GxM, GyM;
+	int Mxp, Myp, Dxp, Dyp, GxM, GyM;
 	bool MoveGX, MoveGY;
 };
 
diff --git a/scribus/canvasmode_objimport.cpp b/scribus/canvasmode_objimport.cpp
index fa565e6..a25f32e 100644
--- a/scribus/canvasmode_objimport.cpp
+++ b/scribus/canvasmode_objimport.cpp
@@ -46,8 +46,7 @@
 
 
 CanvasMode_ObjImport::CanvasMode_ObjImport(ScribusView* view) :
-	CanvasMode(view),
-	m_ScMW(view->m_ScMW)
+	CanvasMode(view)
 {
 	Mxp = Myp = -1;
 	m_mimeData = NULL;
diff --git a/scribus/canvasmode_objimport.h b/scribus/canvasmode_objimport.h
index 1dac430..fd988cd 100644
--- a/scribus/canvasmode_objimport.h
+++ b/scribus/canvasmode_objimport.h
@@ -58,7 +58,6 @@ public:
 private:
 	QMimeData*          m_mimeData;
 	TransactionSettings* m_trSettings;
-	ScribusMainWindow*  m_ScMW;
 	double     Mxp, Myp;
 };
 
diff --git a/scribus/fonts/scface_ttf.cpp b/scribus/fonts/scface_ttf.cpp
index 2939a60..57cdd64 100644
--- a/scribus/fonts/scface_ttf.cpp
+++ b/scribus/fonts/scface_ttf.cpp
@@ -561,8 +561,6 @@ bool ScFace_ttf::glyphNames(QMap<uint, std::pair<QChar, QString> >& GList) const
 	                           (face->charmap && face->charmap->encoding == FT_ENCODING_UNICODE);
 	if (!avoidFntNames)
 		return FtFace::glyphNames(GList);
-
-	const bool hasPSNames = FT_HAS_GLYPH_NAMES(face);
 	
 //	qDebug() << "reading metrics for" << face->family_name << face->style_name;
 	charcode = FT_Get_First_Char(face, &gindex);
diff --git a/scribus/gtwriter.h b/scribus/gtwriter.h
index a072ac6..8431e28 100644
--- a/scribus/gtwriter.h
+++ b/scribus/gtwriter.h
@@ -78,7 +78,6 @@ private:
 	gtStyle* paragraphStyle;
 	gtStyle* characterStyle;
 	bool errorSet;
-	bool shouldAppend;
 	void setDefaultStyle();
 };
 
diff --git a/scribus/loadsaveplugin.cpp b/scribus/loadsaveplugin.cpp
index e9e956d..4bcba34 100644
--- a/scribus/loadsaveplugin.cpp
+++ b/scribus/loadsaveplugin.cpp
@@ -350,7 +350,6 @@ void LoadSavePlugin::unregisterFormat(unsigned int id)
 void LoadSavePlugin::unregisterAll()
 {
 	QList<FileFormat>::iterator it(formats.begin());
-	QList<FileFormat>::iterator itEnd(formats.end());
 	while (it != formats.end())
 	{
 		if ((*it).plug == this)
diff --git a/scribus/pageitem_table.cpp b/scribus/pageitem_table.cpp
index 4105eab..5f8bd9f 100644
--- a/scribus/pageitem_table.cpp
+++ b/scribus/pageitem_table.cpp
@@ -1253,6 +1253,7 @@ void PageItem_Table::assertValid() const
 	// Check that selected cells are valid.
 	foreach (const TableCell& cell, m_selection)
 	{
+		(void)cell;
 		Q_ASSERT(cell.isValid());
 		Q_ASSERT(validCell(cell.row(), cell.column()));
 	}
diff --git a/scribus/plugins/gettext/odtim/stylereader.cpp b/scribus/plugins/gettext/odtim/stylereader.cpp
index 9ba1d5a..23c17a9 100644
--- a/scribus/plugins/gettext/odtim/stylereader.cpp
+++ b/scribus/plugins/gettext/odtim/stylereader.cpp
@@ -1061,9 +1061,8 @@ ListLevel::~ListLevel()
 
 /*** ListStyle **********************************************************************************/
 
-ListStyle::ListStyle(const QString &name, bool consecutiveNumbering, uint currentLevel) :
+ListStyle::ListStyle(const QString &name, uint currentLevel) :
 m_name(name),
-m_consecutiveNumbering(consecutiveNumbering),
 m_currentLevel(currentLevel),
 m_count(0)
 {
diff --git a/scribus/plugins/gettext/odtim/stylereader.h b/scribus/plugins/gettext/odtim/stylereader.h
index 80f1c7b..9624cc3 100644
--- a/scribus/plugins/gettext/odtim/stylereader.h
+++ b/scribus/plugins/gettext/odtim/stylereader.h
@@ -96,7 +96,7 @@ private:
 class ListStyle
 {
 public:
-	ListStyle(const QString &name, bool consecutiveNumbering = false, uint currentLevel = 1);
+	ListStyle(const QString &name, uint currentLevel = 1);
 	~ListStyle();
 	void addLevel(uint level, ListLevel *llevel);
 	QString bullet();
@@ -106,7 +106,6 @@ public:
 	QString& name();
 private:
 	QString m_name;
-	bool m_consecutiveNumbering;
 	uint m_currentLevel;
 	uint m_count;
 	ListLevel* levels[11];
diff --git a/scribus/plugins/gettext/xtgim/xtgim.h b/scribus/plugins/gettext/xtgim/xtgim.h
index fa5b85a..b2a2d72 100755
--- a/scribus/plugins/gettext/xtgim/xtgim.h
+++ b/scribus/plugins/gettext/xtgim/xtgim.h
@@ -48,13 +48,10 @@ private:
 	QString filename;
 	QString in_Buffer;
 	QByteArray buffer;
-	PageItem *textFrame;
-	TextWriter *writer;
 	void loadFiletoArray();
 	QString toUnicode(const QByteArray& rawText);
-	StyleManager *StyleMan;
 public:
 	XtgIm(QString fileName,QString enc,PageItem *textItem,bool textOnly);
 	~XtgIm();
 };
-#endif			/* XTGIM_H */
\ No newline at end of file
+#endif			/* XTGIM_H */
diff --git a/scribus/plugins/import/cgm/importcgm.cpp b/scribus/plugins/import/cgm/importcgm.cpp
index ca06f1f..499d321 100644
--- a/scribus/plugins/import/cgm/importcgm.cpp
+++ b/scribus/plugins/import/cgm/importcgm.cpp
@@ -2521,10 +2521,10 @@ void CgmPlug::decodeClass5(QDataStream &ts, quint16 elemID, quint16 paramLen)
 	}
 	else if (elemID == 43)
 	{
-		int posI = ts.device()->pos();
-		uint type = getBinaryUInt(ts, indexPrecision);
-		QPointF p1 = convertCoords(getBinaryCoords(ts));
-		QPointF p2 = convertCoords(getBinaryCoords(ts));
+		//int posI = ts.device()->pos();
+		//uint type = getBinaryUInt(ts, indexPrecision);
+		//QPointF p1 = convertCoords(getBinaryCoords(ts));
+		//QPointF p2 = convertCoords(getBinaryCoords(ts));
 		uint index = getBinaryUInt(ts, intPrecision);
 	//	qDebug() << "INTERPOLATED INTERIOR  Type" << type << "from" << p1 << "to" << p2 << "Stages" << index << "at" << posI << realPrecision << realMantissa;
 		for (uint s = 0; s < index; s++)
diff --git a/scribus/plugins/import/odg/importodg.cpp b/scribus/plugins/import/odg/importodg.cpp
index 139d0bd..6d1af06 100644
--- a/scribus/plugins/import/odg/importodg.cpp
+++ b/scribus/plugins/import/odg/importodg.cpp
@@ -3448,7 +3448,6 @@ PageItem* OdgPlug::applyStartArrow(PageItem* ite, ObjStyle &obState)
 					EndArrow.map(m);
 					refP = m.map(refP);
 					QPainterPath pa2 = EndArrow.toQPainterPath(true);
-					QRectF br2 = pa2.boundingRect();
 					QTransform m2;
 					FPoint grOffset2(getMinClipF(&EndArrow));
 					m2.translate(-grOffset2.x(), -grOffset2.y());
diff --git a/scribus/plugins/import/pct/importpct.cpp b/scribus/plugins/import/pct/importpct.cpp
index 56e4490..4022a2a 100644
--- a/scribus/plugins/import/pct/importpct.cpp
+++ b/scribus/plugins/import/pct/importpct.cpp
@@ -1716,6 +1716,7 @@ void PctPlug::handlePixmap(QDataStream &ts, quint16 opCode)
 	}
 // reading scrRect
 	QRect scrRect = readRect(ts);
+	(void)scrRect;
 //	qDebug() << "Src Rect" << scrRect;
 // reading dstRect
 	QRect dstRect = readRect(ts);
@@ -1882,10 +1883,12 @@ void PctPlug::handleQuickTime(QDataStream &ts, quint16 opCode)
 	alignStreamToWord(ts, 38);		// Skip version and Matrix information
 	ts >> matteSize;
 	QRect matteRect = readRect(ts);
+	(void)matteRect;
 	if (opCode == 0x8200)
 	{
 		ts >> mode;
 		QRect srcRect = readRect(ts);
+		(void)srcRect;
 		alignStreamToWord(ts, 4);
 		ts >> maskSize;
 		if (matteSize != 0)
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index 050e0a4..d19edec 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -3588,7 +3588,6 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub
 			{
 				int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Unspecified, xCoor, yCoor, 10, 10, 0, CurrColorFill, CommonStrings::None, true);
 				PageItem* ite = m_doc->Items->at(z);
-				FPoint tp2(getMinClipF(&textPath));
 				QTransform mm;
 				mm.scale(1, -1);
 				mm.translate(x, -y);
diff --git a/scribus/plugins/import/shape/importshape.cpp b/scribus/plugins/import/shape/importshape.cpp
index 81fe441..98b492d 100644
--- a/scribus/plugins/import/shape/importshape.cpp
+++ b/scribus/plugins/import/shape/importshape.cpp
@@ -666,8 +666,6 @@ void ShapePlug::parseGroupProperties(QDomNode &DOC, double &minXCoor, double &mi
 {
 	QString FillCol = "White";
 	QString StrokeCol = "Black";
-	QColor stroke = Qt::black;
-	QColor fill = Qt::white;
 	while(!DOC.isNull())
 	{
 		double x1, y1, x2, y2;
diff --git a/scribus/plugins/picbrowser/iview.h b/scribus/plugins/picbrowser/iview.h
index abc5b78..05d2133 100644
--- a/scribus/plugins/picbrowser/iview.h
+++ b/scribus/plugins/picbrowser/iview.h
@@ -45,7 +45,6 @@ class IView: public QGraphicsView
 
 		QPointF mouseStartPoint;
 		QRect theRect;
-		bool isSelecting;
 		bool isPanning;
 
 		bool m_keepFitted;
diff --git a/scribus/scimgdataloader_pict.cpp b/scribus/scimgdataloader_pict.cpp
index 14e6b6d..ccadaa3 100644
--- a/scribus/scimgdataloader_pict.cpp
+++ b/scribus/scimgdataloader_pict.cpp
@@ -1317,6 +1317,7 @@ void ScImgDataLoader_PICT::handlePixmap(QDataStream &ts, quint16 opCode)
 	}
 // reading scrRect
 	QRect scrRect = readRect(ts);
+	(void)scrRect;
 //	qDebug() << "Src Rect" << scrRect;
 // reading dstRect
 	QRect dstRect = readRect(ts);
@@ -1465,10 +1466,12 @@ void ScImgDataLoader_PICT::handleQuickTime(QDataStream &ts, quint16 opCode)
 	alignStreamToWord(ts, 38);		// Skip version and Matrix information
 	ts >> matteSize;
 	QRect matteRect = readRect(ts);
+	(void)matteRect;
 	if (opCode == 0x8200)
 	{
 		ts >> mode;
 		QRect srcRect = readRect(ts);
+		(void)srcRect;
 		alignStreamToWord(ts, 4);
 		ts >> maskSize;
 		if (matteSize != 0)
diff --git a/scribus/scimgdataloader_pict.h b/scribus/scimgdataloader_pict.h
index 4a45a5c..759ab2a 100644
--- a/scribus/scimgdataloader_pict.h
+++ b/scribus/scimgdataloader_pict.h
@@ -77,8 +77,6 @@ private:
 	QByteArray patternData;
 	QRect currRect;
 	QBrush currPatternBrush;
-	int currRectItemNr;
-	int currRectType;
 	QRect lastImageRect;
 	QPoint ovalSize;
 	QMap<int, QString> fontMap;
diff --git a/scribus/scpainter.h b/scribus/scpainter.h
index 63b4be2..ec76e25 100644
--- a/scribus/scpainter.h
+++ b/scribus/scpainter.h
@@ -183,7 +183,6 @@ private:
 	double fill_trans;
 	bool m_fillRule;
 	int fillMode;				// 0 = none, 1 = solid, 2 = gradient 3 = pattern 4 = hatch
-	int gradientMode;		// 1 = linear, 2 = radial, 3 = 4colour
 	double patternScaleX;
 	double patternScaleY;
 	double patternOffsetX;
diff --git a/scribus/scpainterex_ps2.h b/scribus/scpainterex_ps2.h
index 0d009c5..5f12296 100644
--- a/scribus/scpainterex_ps2.h
+++ b/scribus/scpainterex_ps2.h
@@ -210,7 +210,6 @@ private:
 	double m_fillTrans;
 	bool   m_fillRule;
 	int    m_fillMode;			// 0 = none, 1 = solid, 2 = gradient
-	int    m_gradientMode;		// 1 = linear, 2 = radial
 
 	double m_patternScaleX;
 	double m_patternScaleY;
@@ -236,8 +235,6 @@ private:
 	double m_offset;
 /* Transformation Stack */
 	QStack<QTransform> m_stack;
-/* Zoom Factor of the Painter */
-	double m_zoomFactor;
 
 /* Some data to describe state of drawing */	
 	bool m_pathIsClosed;
diff --git a/scribus/scribusdoc.cpp b/scribus/scribusdoc.cpp
index 55db12e..8f4b021 100644
--- a/scribus/scribusdoc.cpp
+++ b/scribus/scribusdoc.cpp
@@ -9893,7 +9893,6 @@ void ScribusDoc::MirrorPolyV(PageItem* currItem)
 			ss->set("IS_CONTOUR", true);
 			undoManager->action(currItem, ss, Um::IBorder);
 		}
-		FPoint tp2(getMinClipF(&currItem->ContourLine));
 		FPoint tp(getMaxClipF(&currItem->ContourLine));
 		ma.translate(0, qRound(tp.y()));
 		ma.scale(1, -1);
diff --git a/scribus/serializer.cpp b/scribus/serializer.cpp
index 32b0a04..e4ec4e3 100644
--- a/scribus/serializer.cpp
+++ b/scribus/serializer.cpp
@@ -138,7 +138,7 @@ class MergeColors_body : public Action_body
 class MergeColors : public MakeAction<MergeColors_body>
 {};
 
-Serializer::Serializer(ScribusDoc& doc) : Digester(), m_Doc(doc)
+Serializer::Serializer(ScribusDoc& doc) : Digester()
 {
 	// register desaxe rules for styles, colors and elems
 	addRule("/SCRIBUSFRAGMENT", Factory<Collection>());
diff --git a/scribus/serializer.h b/scribus/serializer.h
index f6382cc..1930be5 100644
--- a/scribus/serializer.h
+++ b/scribus/serializer.h
@@ -80,7 +80,6 @@ public:
 								  const QString& txt);
 
 private:
-	ScribusDoc& m_Doc;
 	ColorList backUpColors;
 //	Selection importCollection();
 //	void updateGradientColors(const ColorList& colors);
diff --git a/scribus/ui/sclistwidgetdelegate.cpp b/scribus/ui/sclistwidgetdelegate.cpp
index 34d63f1..8bbeb23 100644
--- a/scribus/ui/sclistwidgetdelegate.cpp
+++ b/scribus/ui/sclistwidgetdelegate.cpp
@@ -31,8 +31,6 @@ ScListWidgetDelegate::ScListWidgetDelegate(QListWidget *view, QWidget *parent) :
 
 void ScListWidgetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-	const QAbstractItemModel *model = index.model();
-	Q_ASSERT(model);
 	if (m_dispIconOnly)
 	{
 		painter->save();
-- 
2.1.0

