Backport: Modernize Platform.h (3) - update Surface to delete WidthChar, use size_t for Polygon and delete the standard copy and assignment methods.

Backport of changeset 6940:89fd29243232.

3 files changed, 8 insertions, 11 deletions

diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index ac8fbc9cc..26890e4b7 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -269,7 +269,7 @@ void SurfaceImpl::LineTo(int x_, int y_)
 }
 
 void SurfaceImpl::Polygon(Point *pts,
-                          int npts,
+			  size_t npts,
                           ColourDesired fore,
                           ColourDesired back)
 {
@@ -277,11 +277,11 @@ void SurfaceImpl::Polygon(Point *pts,
 	BrushColour(back);
 
 	std::vector<QPoint> qpts(npts);
-	for (int i = 0; i < npts; i++) {
+	for (size_t i = 0; i < npts; i++) {
 		qpts[i] = QPoint(pts[i].x, pts[i].y);
 	}
 
-	GetPainter()->drawPolygon(&qpts[0], npts);
+	GetPainter()->drawPolygon(&qpts[0], static_cast<int>(npts));
 }
 
 void SurfaceImpl::RectangleDraw(PRectangle rc,
@@ -494,12 +494,6 @@ XYPOSITION SurfaceImpl::WidthText(Font &font, const char *s, int len)
 	return metrics.width(string);
 }
 
-XYPOSITION SurfaceImpl::WidthChar(Font &font, char ch)
-{
-	QFontMetricsF metrics(*FontPointer(font), device);
-	return metrics.width(ch);
-}
-
 XYPOSITION SurfaceImpl::Ascent(Font &font)
 {
 	QFontMetricsF metrics(*FontPointer(font), device);
diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h
index 653399dbc..4d762bccf 100644
--- a/qt/ScintillaEditBase/PlatQt.h
+++ b/qt/ScintillaEditBase/PlatQt.h
@@ -11,6 +11,8 @@
 #ifndef PLATQT_H
 #define PLATQT_H
 
+#include <cstddef>
+
 #include "Platform.h"
 
 #include <QUrl>
@@ -78,7 +80,7 @@ public:
 	int DeviceHeightFont(int points) override;
 	void MoveTo(int x_, int y_) override;
 	void LineTo(int x_, int y_) override;
-	void Polygon(Point *pts, int npts, ColourDesired fore,
+	void Polygon(Point *pts, size_t npts, ColourDesired fore,
 		ColourDesired back) override;
 	void RectangleDraw(PRectangle rc, ColourDesired fore,
 		ColourDesired back) override;
@@ -103,7 +105,6 @@ public:
 	void MeasureWidths(Font &font, const char *s, int len,
 		XYPOSITION *positions) override;
 	XYPOSITION WidthText(Font &font, const char *s, int len) override;
-	XYPOSITION WidthChar(Font &font, char ch) override;
 	XYPOSITION Ascent(Font &font) override;
 	XYPOSITION Descent(Font &font) override;
 	XYPOSITION InternalLeading(Font &font) override;
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index 20acf3086..5ab9dc115 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -12,6 +12,8 @@
 #ifndef SCINTILLAEDITBASE_H
 #define SCINTILLAEDITBASE_H
 
+#include <cstddef>
+
 #include "Platform.h"
 #include "Scintilla.h"