diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-04-15 16:47:52 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-04-15 16:47:52 +1000 |
| commit | faf57f45eae60a257a8076c83c71c422486f88ce (patch) | |
| tree | bae925421b4048bc7de7784e38d73b9960e85553 /qt/ScintillaEditBase | |
| parent | 75dba090f235fc4d24691bd1b57928f89ebe9f1b (diff) | |
| download | scintilla-mirror-faf57f45eae60a257a8076c83c71c422486f88ce.tar.gz | |
Avoid calling virtual functions in constructors and destructors.
Diffstat (limited to 'qt/ScintillaEditBase')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 4 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index c5490a1d6..afa19e5a5 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -45,7 +45,7 @@ ScintillaQt::ScintillaQt(QAbstractScrollArea *parent) // Buffered drawing turned off by default to avoid this. WndProc(SCI_SETBUFFEREDDRAW, false, 0); - Initialise(); + Init(); for (TickReason tr = tickCaret; tr <= tickDwell; tr = static_cast<TickReason>(tr + 1)) { timers[tr] = 0; @@ -128,7 +128,7 @@ static ScintillaRectangularMime *singletonMime = 0; #endif -void ScintillaQt::Initialise() +void ScintillaQt::Init() { #if defined(Q_OS_WIN) || defined(Q_OS_MAC) rectangularSelectionModifier = SCMOD_ALT; diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index d140c6e5c..bfa67339c 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -99,7 +99,7 @@ private slots: void SelectionChanged(); private: - virtual void Initialise(); + void Init(); virtual void Finalise(); virtual bool DragThreshold(Point ptStart, Point ptNow); virtual bool ValidCodePage(int codePage) const; |