aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp6
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 43e15563f..b09812236 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -214,7 +214,7 @@ void SurfaceImpl::InitPixMap(int width,
if (height < 1) height = 1;
deviceOwned = true;
device = new QPixmap(width, height);
- SurfaceImpl *psurfOther = static_cast<SurfaceImpl *>(surface);
+ SurfaceImpl *psurfOther = dynamic_cast<SurfaceImpl *>(surface);
SetUnicodeMode(psurfOther->unicodeMode);
SetDBCSMode(psurfOther->codePage);
}
@@ -320,7 +320,7 @@ void SurfaceImpl::FillRectangle(PRectangle rc, ColourDesired back)
void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern)
{
// Tile pattern over rectangle
- SurfaceImpl *surface = static_cast<SurfaceImpl *>(&surfacePattern);
+ SurfaceImpl *surface = dynamic_cast<SurfaceImpl *>(&surfacePattern);
// Currently assumes 8x8 pattern
int widthPat = 8;
int heightPat = 8;
@@ -432,7 +432,7 @@ void SurfaceImpl::Ellipse(PRectangle rc,
void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource)
{
- SurfaceImpl *source = static_cast<SurfaceImpl *>(&surfaceSource);
+ SurfaceImpl *source = dynamic_cast<SurfaceImpl *>(&surfaceSource);
QPixmap *pixmap = static_cast<QPixmap *>(source->GetPaintDevice());
GetPainter()->drawPixmap(rc.left, rc.top, *pixmap, from.x, from.y, -1, -1);
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index d822c84d4..dac6929ff 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -42,7 +42,7 @@
using namespace Scintilla;
ScintillaEditBase::ScintillaEditBase(QWidget *parent)
-: QAbstractScrollArea(parent), sqt(0), preeditPos(-1), wheelDelta(0)
+: QAbstractScrollArea(parent), sqt(nullptr), preeditPos(-1), wheelDelta(0)
{
sqt = new ScintillaQt(this);