aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-10-26 08:13:50 +1100
committerNeil <nyamatongwe@gmail.com>2021-10-26 08:13:50 +1100
commitc1c75875711460c2de9c838b5f679dc8d965aea6 (patch)
tree4de0228e59135a1c9c05f6d90197f9ffa6a6cac2
parent947d0a3b4031be0e6881b12e92df751675faabe8 (diff)
downloadscintilla-mirror-c1c75875711460c2de9c838b5f679dc8d965aea6.tar.gz
Ensure variables initialized.
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp2
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.cpp4
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp8
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.h2
-rw-r--r--src/CellBuffer.cxx2
5 files changed, 9 insertions, 9 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 96b05a855..a9bb4b0f9 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -1319,7 +1319,7 @@ void Platform::DebugDisplay(const char *s) noexcept
void Platform::DebugPrintf(const char *format, ...) noexcept
{
char buffer[2000];
- va_list pArguments;
+ va_list pArguments{};
va_start(pArguments, format);
vsprintf(buffer, format, pArguments);
va_end(pArguments);
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 2fb46c76e..a0a9cd541 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -675,11 +675,11 @@ QVariant ScintillaEditBase::inputMethodQuery(Qt::InputMethodQuery query) const
int paraEnd = sqt->pdoc->ParaDown(pos);
QVarLengthArray<char,1024> buffer(paraEnd - paraStart + 1);
- Sci_CharacterRange charRange;
+ Sci_CharacterRange charRange{};
charRange.cpMin = paraStart;
charRange.cpMax = paraEnd;
- Sci_TextRange textRange;
+ Sci_TextRange textRange{};
textRange.chrg = charRange;
textRange.lpstrText = buffer.data();
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 2bc2957f8..1a462c9ba 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -27,7 +27,8 @@ using namespace Scintilla::Internal;
ScintillaQt::ScintillaQt(QAbstractScrollArea *parent)
: QObject(parent), scrollArea(parent), vMax(0), hMax(0), vPage(0), hPage(0),
- haveMouseCapture(false), dragWasDropped(false)
+ haveMouseCapture(false), dragWasDropped(false),
+ rectangularSelectionModifier(SCMOD_ALT)
{
wMain = scrollArea->viewport();
@@ -490,12 +491,11 @@ void ScintillaQt::onIdle()
bool ScintillaQt::ChangeIdle(bool on)
{
- QTimer *qIdle;
if (on) {
// Start idler, if it's not running.
if (!idler.state) {
idler.state = true;
- qIdle = new QTimer;
+ QTimer *qIdle = new QTimer;
connect(qIdle, SIGNAL(timeout()), this, SLOT(onIdle()));
qIdle->start(0);
idler.idlerID = qIdle;
@@ -504,7 +504,7 @@ bool ScintillaQt::ChangeIdle(bool on)
// Stop idler, if it's running
if (idler.state) {
idler.state = false;
- qIdle = static_cast<QTimer *>(idler.idlerID);
+ QTimer *qIdle = static_cast<QTimer *>(idler.idlerID);
qIdle->stop();
disconnect(qIdle, SIGNAL(timeout()), nullptr, nullptr);
delete qIdle;
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index 858c20c01..9c71169cc 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -128,7 +128,7 @@ private:
void NotifyFocus(bool focus) override;
void NotifyParent(Scintilla::NotificationData scn) override;
void NotifyURIDropped(const char *uri);
- int timers[static_cast<size_t>(TickReason::dwell)+1];
+ int timers[static_cast<size_t>(TickReason::dwell)+1]{};
bool FineTickerRunning(TickReason reason) override;
void FineTickerStart(TickReason reason, int millis, int tolerance) override;
void CancelTimers();
diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx
index b922b08bb..178975c1e 100644
--- a/src/CellBuffer.cxx
+++ b/src/CellBuffer.cxx
@@ -1286,7 +1286,7 @@ void CellBuffer::EndUndoAction() {
}
void CellBuffer::AddUndoAction(Sci::Position token, bool mayCoalesce) {
- bool startSequence;
+ bool startSequence = false;
uh.AppendAction(ActionType::container, token, nullptr, 0, startSequence, mayCoalesce);
}