diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-05-14 14:13:13 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-05-14 14:13:13 +1000 |
| commit | c4aa7826f3d2178e39e5bff2f6886d7d3d3f46d7 (patch) | |
| tree | e5f93f314c700da99e6c54f590d034645c73a111 /qt/ScintillaEditBase | |
| parent | 3fc8c97d80a6797e60e6b203c9b4aa9d553df8a7 (diff) | |
| download | scintilla-mirror-c4aa7826f3d2178e39e5bff2f6886d7d3d3f46d7.tar.gz | |
Modernize Platform.h (3) - update Surface to delete WidthChar, use size_t for
Polygon and delete the standard copy and assignment methods.
Diffstat (limited to 'qt/ScintillaEditBase')
| -rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 12 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/PlatQt.h | 3 |
2 files changed, 4 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 00a9645ef..07da76682 100644 --- a/qt/ScintillaEditBase/PlatQt.h +++ b/qt/ScintillaEditBase/PlatQt.h @@ -80,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; @@ -105,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; |