diff options
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.cpp')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index 3c62ec7fd..72589396b 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -173,7 +173,7 @@ static QString StringFromSelectedText(const SelectionText &selectedText) } } -static void AddRectangularToMime(QMimeData *mimeData, QString su) +static void AddRectangularToMime(QMimeData *mimeData, [[maybe_unused]] QString su) { #if defined(Q_OS_WIN) // Add an empty marker @@ -184,7 +184,6 @@ static void AddRectangularToMime(QMimeData *mimeData, QString su) // clipboard format is supposed to be UTF-16, not UTF-8. mimeData->setData(sScintillaRecMimeType, su.toUtf8()); #else - Q_UNUSED(su); // Linux // Add an empty marker mimeData->setData(sMimeRectangularMarker, QByteArray()); @@ -486,9 +485,9 @@ bool ScintillaQt::ChangeIdle(bool on) idler.state = false; qIdle = static_cast<QTimer *>(idler.idlerID); qIdle->stop(); - disconnect(qIdle, SIGNAL(timeout()), 0, 0); + disconnect(qIdle, SIGNAL(timeout()), nullptr, nullptr); delete qIdle; - idler.idlerID = 0; + idler.idlerID = {}; } } return true; @@ -572,7 +571,7 @@ CaseFolder *ScintillaQt::CaseFolderForEncoding() // Only for single byte encodings for (int i=0x80; i<0x100; i++) { char sCharacter[2] = "A"; - sCharacter[0] = i; + sCharacter[0] = static_cast<char>(i); QString su = codec->toUnicode(sCharacter, 1); QString suFolded = su.toCaseFolded(); if (codec->canEncode(suFolded)) { @@ -587,7 +586,7 @@ CaseFolder *ScintillaQt::CaseFolderForEncoding() return new CaseFolderDBCS(QTextCodec::codecForName(charSetBuffer)); } } - return 0; + return nullptr; } } |