diff options
author | Neil Hodgson <nyamatongwe@gmail.com> | 2021-11-23 13:14:00 +1100 |
---|---|---|
committer | Neil Hodgson <nyamatongwe@gmail.com> | 2021-11-23 13:14:00 +1100 |
commit | db88fdbca47826624fd95c911a55a97266fd03c2 (patch) | |
tree | 4c292f31e4e3abecca6ad8d13cdc009f1168fbd3 /qt/ScintillaEditBase/ScintillaEditBase.cpp | |
parent | 12b95b0365aea7f6d766a5dc08a84582c91f02d5 (diff) | |
download | scintilla-mirror-db88fdbca47826624fd95c911a55a97266fd03c2.tar.gz |
Fix warnings from Qt Creator 5.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaEditBase.cpp')
-rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index d4109f041..13945838d 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -41,10 +41,8 @@ using namespace Scintilla; using namespace Scintilla::Internal; ScintillaEditBase::ScintillaEditBase(QWidget *parent) -: QAbstractScrollArea(parent), sqt(nullptr), preeditPos(-1), wheelDelta(0) +: QAbstractScrollArea(parent), sqt(new ScintillaQt(this)), preeditPos(-1), wheelDelta(0) { - sqt = new ScintillaQt(this); - time.start(); // Set Qt defaults. @@ -92,7 +90,7 @@ ScintillaEditBase::ScintillaEditBase(QWidget *parent) this, SIGNAL(aboutToCopy(QMimeData*))); } -ScintillaEditBase::~ScintillaEditBase() {} +ScintillaEditBase::~ScintillaEditBase() = default; sptr_t ScintillaEditBase::send( unsigned int iMessage, @@ -559,7 +557,7 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event) sqt->view.imeCaretBlockOverride = false; if (!event->commitString().isEmpty()) { - const QString commitStr = event->commitString(); + const QString &commitStr = event->commitString(); const unsigned int commitStrLen = commitStr.length(); for (unsigned int i = 0; i < commitStrLen;) { @@ -831,7 +829,7 @@ void ScintillaEditBase::event_command(uptr_t wParam, sptr_t lParam) emit command(wParam, lParam); } -KeyMod ScintillaEditBase::ModifiersOfKeyboard() const +KeyMod ScintillaEditBase::ModifiersOfKeyboard() { const bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier; const bool ctrl = QApplication::keyboardModifiers() & Qt::ControlModifier; |