r23073 by jghali - Mark virtual methods inherited from TextLayoutPainter with override specifier

scribus-commit scribus-commit at lists.scribus.net
Sat Jul 13 21:38:40 UTC 2019


Author: jghali
Date: Sat Jul 13 21:38:40 2019
New Revision: 23073

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23073
Log:
Mark virtual methods inherited from TextLayoutPainter with override specifier

Modified:
    trunk/Scribus/scribus/documentchecker.cpp
    trunk/Scribus/scribus/pdflib_core.cpp
    trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
    trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
    trunk/Scribus/scribus/pslib.cpp
    trunk/Scribus/scribus/scpageoutput.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/text/screenpainter.h

Modified: trunk/Scribus/scribus/documentchecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/documentchecker.cpp
==============================================================================
--- trunk/Scribus/scribus/documentchecker.cpp	(original)
+++ trunk/Scribus/scribus/documentchecker.cpp	Sat Jul 13 21:38:40 2019
@@ -48,7 +48,7 @@
 //		, m_textLayout(textLayout)
 	{ }
 
-	void drawGlyph(const GlyphCluster& gc)
+	void drawGlyph(const GlyphCluster& gc) override
 	{
 		if (gc.isEmpty())
 		{
@@ -56,13 +56,13 @@
 			m_itemError.insert(MissingGlyph, pos);
 		}
 	}
-	void drawGlyphOutline(const GlyphCluster& gc, bool)
+	void drawGlyphOutline(const GlyphCluster& gc, bool) override
 	{
 		drawGlyph(gc);
 	}
-	void drawLine(QPointF, QPointF) { }
-	void drawRect(QRectF) { }
-	void drawObject(PageItem*) { }
+	void drawLine(QPointF, QPointF) override { }
+	void drawRect(QRectF) override { }
+	void drawObject(PageItem*) override { }
 };
 
 bool isPartFilledImageFrame(PageItem * currItem)

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Sat Jul 13 21:38:40 2019
@@ -144,7 +144,7 @@
 
 	~PdfPainter() {}
 
-	void drawGlyph(const GlyphCluster& gc)
+	void drawGlyph(const GlyphCluster& gc) override
 	{
 		if (gc.isControlGlyphs() || gc.isEmpty())
 			return;
@@ -253,7 +253,7 @@
 		}
 	}
 
-	void drawGlyphOutline(const GlyphCluster& gc, bool fill)
+	void drawGlyphOutline(const GlyphCluster& gc, bool fill) override
 	{
 		if (gc.isControlGlyphs() || gc.isEmpty())
 			return;
@@ -459,7 +459,7 @@
 		}
 	}
 
-	void drawLine(QPointF start, QPointF end)
+	void drawLine(QPointF start, QPointF end) override
 	{
 		QTransform transform = matrix();
 		transform.translate(x(), y());
@@ -478,7 +478,7 @@
 		return m_backBuffer + "BT\n" + m_glyphBuffer + "ET\n" + m_pathBuffer;
 	}
 
-	void drawRect(QRectF rect)
+	void drawRect(QRectF rect) override
 	{
 		QTransform transform = matrix();
 //		transform.translate(x(), y());
@@ -497,7 +497,7 @@
 		m_backBuffer += "Q\n";
 	}
 
-	void drawObject(PageItem* embedded)
+	void drawObject(PageItem* embedded) override
 	{
 		m_glyphBuffer += "ET\n"+m_pathBuffer;
 		m_pathBuffer.clear();

Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp	Sat Jul 13 21:38:40 2019
@@ -1154,7 +1154,7 @@
 		, m_trans(trans)
 	{}
 
-	void drawGlyph(const GlyphCluster& gc)
+	void drawGlyph(const GlyphCluster& gc) override
 	{
 		if (gc.isControlGlyphs() || gc.isEmpty())
 			return;
@@ -1182,7 +1182,7 @@
 		}
 	}
 
-	void drawGlyphOutline(const GlyphCluster& gc, bool hasFill)
+	void drawGlyphOutline(const GlyphCluster& gc, bool hasFill) override
 	{
 		if (gc.isControlGlyphs() | gc.isEmpty())
 			return;
@@ -1214,7 +1214,7 @@
 		}
 	}
 
-	void drawLine(QPointF start, QPointF end)
+	void drawLine(QPointF start, QPointF end) override
 	{
 		QTransform transform = matrix();
 		transform.translate(x(), y());
@@ -1231,7 +1231,7 @@
 		m_elem.appendChild(path);
 	}
 
-	void drawRect(QRectF rect)
+	void drawRect(QRectF rect) override
 	{
 		QTransform transform = matrix();
 		transform.translate(x(), y());
@@ -1247,7 +1247,7 @@
 		m_elem.appendChild(path);
 	}
 
-	void drawObject(PageItem* item)
+	void drawObject(PageItem* item) override
 	{
 		QTransform transform = matrix();
 		transform.translate(x() + item->gXpos, y() + item->gYpos);

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp	(original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp	Sat Jul 13 21:38:40 2019
@@ -821,7 +821,7 @@
 		m_relRoot(rel_root)
 	{ }
 
-	void drawGlyph(const GlyphCluster& gc)
+	void drawGlyph(const GlyphCluster& gc) override
 	{
 		if (gc.isControlGlyphs() || gc.isEmpty())
 			return;
@@ -886,7 +886,7 @@
 		m_transform = transform;
 	}
 
-	void drawGlyphOutline(const GlyphCluster& gc, bool fill)
+	void drawGlyphOutline(const GlyphCluster& gc, bool fill) override
 	{
 		if (gc.isControlGlyphs())
 			return;
@@ -927,7 +927,7 @@
 		m_restart = true;
 	}
 
-	void drawLine(QPointF start, QPointF end)
+	void drawLine(QPointF start, QPointF end) override
 	{
 		QTransform transform = matrix();
 		QDomElement path = m_xps->p_docu.createElement("Path");
@@ -939,7 +939,7 @@
 		m_restart = true;
 	}
 
-	void drawRect(QRectF rect)
+	void drawRect(QRectF rect) override
 	{
 		QTransform transform = matrix();
 		double rx = (x() + rect.x()) * m_xps->conversionFactor;
@@ -961,7 +961,7 @@
 		m_restart = true;
 	}
 
-	void drawObject(PageItem* item)
+	void drawObject(PageItem* item) override
 	{
 		QDomElement canvas = m_xps->p_docu.createElement("Canvas");
 		QTransform matrix = QTransform();

Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp	(original)
+++ trunk/Scribus/scribus/pslib.cpp	Sat Jul 13 21:38:40 2019
@@ -94,11 +94,11 @@
 		m_ps(ps)
 	{}
 
-	void drawGlyph(const GlyphCluster& gc);
-	void drawGlyphOutline(const GlyphCluster& gc, bool fill);
-	void drawLine(QPointF start, QPointF end);
-	void drawRect(QRectF rect);
-	void drawObject(PageItem* item);
+	void drawGlyph(const GlyphCluster& gc) override;
+	void drawGlyphOutline(const GlyphCluster& gc, bool fill) override;
+	void drawLine(QPointF start, QPointF end) override;
+	void drawRect(QRectF rect) override;
+	void drawObject(PageItem* item) override;
 };
 
 void PSPainter::drawGlyph(const GlyphCluster& gc)

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Sat Jul 13 21:38:40 2019
@@ -950,31 +950,31 @@
 		, m_scpage(scpage)
 	{}
 
-	void translate(double xp, double yp)
+	void translate(double xp, double yp) override
 	{
 		TextLayoutPainter::translate(xp, yp);
 		m_painter->translate(xp, yp);
 	}
 
-	void save()
+	void save() override
 	{
 		TextLayoutPainter::save();
 		m_painter->save();
 	}
 
-	void restore()
+	void restore() override
 	{
 		TextLayoutPainter::restore();
 		m_painter->restore();
 	}
 
-	void setScale(double h, double v)
+	void setScale(double h, double v) override
 	{
 		TextLayoutPainter::setScale(h, v);
 		m_painter->scale(h, v);
 	}
 
-	void drawGlyph(const GlyphCluster& gc)
+	void drawGlyph(const GlyphCluster& gc) override
 	{
 		if (gc.isControlGlyphs())
 			return;
@@ -1010,7 +1010,7 @@
 		m_painter->restore();
 	}
 
-	void drawGlyphOutline(const GlyphCluster& gc, bool fill)
+	void drawGlyphOutline(const GlyphCluster& gc, bool fill) override
 	{
 		if (gc.isControlGlyphs())
 			return;
@@ -1049,7 +1049,7 @@
 		m_painter->restore();
 	}
 
-	void drawLine(QPointF start, QPointF end)
+	void drawLine(QPointF start, QPointF end) override
 	{
 		m_painter->save();
 		setupState();
@@ -1057,7 +1057,7 @@
 		m_painter->restore();
 	}
 
-	void drawRect(QRectF rect)
+	void drawRect(QRectF rect) override
 	{
 		m_painter->save();
 		setupState();
@@ -1067,7 +1067,7 @@
 		m_painter->restore();
 	}
 
-	void drawObject(PageItem* embedded)
+	void drawObject(PageItem* embedded) override
 	{
 		QRect cullingArea;
 		if (!embedded)

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Sat Jul 13 21:38:40 2019
@@ -4281,7 +4281,7 @@
 		: m_really(Really)
 	{}
 
-	void drawGlyph(const GlyphCluster& gc)
+	void drawGlyph(const GlyphCluster& gc) override
 	{
 		if (gc.isControlGlyphs())
 			return;
@@ -4300,15 +4300,15 @@
 		}
 	}
 
-	void drawGlyphOutline(const GlyphCluster& gc, bool)
+	void drawGlyphOutline(const GlyphCluster& gc, bool) override
 	{
 		drawGlyph(gc);
 	}
 
 	// we don't need this one
-	void drawLine(QPointF, QPointF) {}
-	void drawRect(QRectF) {}
-	void drawObject(PageItem*) {}
+	void drawLine(QPointF, QPointF) override {}
+	void drawRect(QRectF) override {}
+	void drawObject(PageItem*) override {}
 
 private:
 	QMap<QString, QMap<uint, FPointArray> > & m_really;

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Sat Jul 13 21:38:40 2019
@@ -2979,7 +2979,7 @@
 			, m_counter(0)
 		{}
 
-		void drawGlyph(const GlyphCluster& gc)
+		void drawGlyph(const GlyphCluster& gc) override
 		{
 			for (const GlyphLayout& gl : gc.glyphs())
 			{
@@ -3027,7 +3027,8 @@
 				m_group.append(m_view->Doc->Items->takeAt(z));
 			}
 		}
-		void drawGlyphOutline(const GlyphCluster& gc, bool fill)
+
+		void drawGlyphOutline(const GlyphCluster& gc, bool fill) override
 		{
 			for (const GlyphLayout& gl : gc.glyphs())
 			{
@@ -3078,7 +3079,8 @@
 				m_group.append(m_view->Doc->Items->takeAt(z));
 			}
 		}
-		void drawLine(QPointF start, QPointF end)
+
+		void drawLine(QPointF start, QPointF end) override
 		{
 			QTransform transform = matrix();
 			transform.translate(x(), y());
@@ -3106,8 +3108,9 @@
 			m_view->undoManager->setUndoEnabled(true);
 			m_group.append(m_view->Doc->Items->takeAt(z));
 		}
-		void drawRect(QRectF rect) {}
-		void drawObject(PageItem* item) {}
+
+		void drawRect(QRectF rect) override {}
+		void drawObject(PageItem* item) override {}
 };
 
 void ScribusView::TextToPath()

Modified: trunk/Scribus/scribus/text/screenpainter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23073&path=/trunk/Scribus/scribus/text/screenpainter.h
==============================================================================
--- trunk/Scribus/scribus/text/screenpainter.h	(original)
+++ trunk/Scribus/scribus/text/screenpainter.h	Sat Jul 13 21:38:40 2019
@@ -21,11 +21,12 @@
 
 	~ScreenPainter();
 
-	void drawGlyph(const GlyphCluster& gc);
-	void drawGlyphOutline(const GlyphCluster& gc, bool fill);
-	void drawLine(QPointF start, QPointF end);
-	void drawRect(QRectF rect);
-	void drawObject(PageItem* embedded);
+	void drawGlyph(const GlyphCluster& gc) override;
+	void drawGlyphOutline(const GlyphCluster& gc, bool fill) override;
+	void drawLine(QPointF start, QPointF end) override;
+	void drawRect(QRectF rect) override;
+	void drawObject(PageItem* embedded) override;
+
 	void clip(QRectF rect);
 	void saveState();
 	void restoreState();




More information about the scribus-commit mailing list