Fix warnings from Qt Creator 5.

4 files changed, 17 insertions, 24 deletions

diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index a9bb4b0f9..3cf4cab44 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -117,15 +117,13 @@ class FontAndCharacterSet : public Font {
 public:
 	CharacterSet characterSet = CharacterSet::Ansi;
 	std::unique_ptr<QFont> pfont;
-	explicit FontAndCharacterSet(const FontParameters &fp) {
+	explicit FontAndCharacterSet(const FontParameters &fp) : characterSet(fp.characterSet) {
 		pfont = std::make_unique<QFont>();
 		pfont->setStyleStrategy(ChooseStrategy(fp.extraFontFlag));
 		pfont->setFamily(QString::fromUtf8(fp.faceName));
 		pfont->setPointSizeF(fp.size);
 		pfont->setBold(static_cast<int>(fp.weight) > 500);
 		pfont->setItalic(fp.italic);
-
-		characterSet = fp.characterSet;
 	}
 };
 
@@ -154,8 +152,7 @@ std::shared_ptr<Font> Font::Allocate(const FontParameters &fp)
 	return std::make_shared<FontAndCharacterSet>(fp);
 }
 
-SurfaceImpl::SurfaceImpl()
-{}
+SurfaceImpl::SurfaceImpl() = default;
 
 SurfaceImpl::SurfaceImpl(int width, int height, SurfaceMode mode_)
 {
@@ -456,8 +453,8 @@ void SurfaceImpl::Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) {
 
 	QPainterPath path;
 
-	const Ends leftSide = static_cast<Ends>(static_cast<int>(ends) & 0xf);
-	const Ends rightSide = static_cast<Ends>(static_cast<int>(ends) & 0xf0);
+	const Ends leftSide = static_cast<Ends>(static_cast<unsigned int>(ends) & 0xfu);
+	const Ends rightSide = static_cast<Ends>(static_cast<unsigned int>(ends) & 0xf0u);
 	switch (leftSide) {
 		case Ends::leftFlat:
 			path.moveTo(rc.left + halfStroke, rc.top + halfStroke);
@@ -806,7 +803,7 @@ QRect ScreenRectangleForPoint(QPoint posGlobal)
 
 }
 
-Window::~Window() noexcept {}
+Window::~Window() noexcept = default;
 
 void Window::Destroy() noexcept
 {
@@ -959,15 +956,13 @@ public:
 	void SetList(const char *list, char separator, char typesep) override;
 	void SetOptions(ListOptions options_) override;
 
-	ListWidget *GetWidget() const noexcept;
+	[[nodiscard]] ListWidget *GetWidget() const noexcept;
 private:
-	bool unicodeMode;
-	int visibleRows;
+	bool unicodeMode{false};
+	int visibleRows{5};
 	QMap<int,QPixmap> images;
 };
-ListBoxImpl::ListBoxImpl() noexcept
-: unicodeMode(false), visibleRows(5)
-{}
+ListBoxImpl::ListBoxImpl() noexcept = default;
 
 void ListBoxImpl::Create(Window &parent,
                          int /*ctrlID*/,
@@ -1204,8 +1199,8 @@ ListWidget *ListBoxImpl::GetWidget() const noexcept
 	return static_cast<ListWidget *>(wid);
 }
 
-ListBox::ListBox() noexcept {}
-ListBox::~ListBox() noexcept {}
+ListBox::ListBox() noexcept = default;
+ListBox::~ListBox() noexcept = default;
 
 std::unique_ptr<ListBox> ListBox::Allocate()
 {
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;
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index 9acc9c379..f63ca7e0f 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -161,7 +161,7 @@ private:
 	static bool IsHangul(const QChar qchar);
 	void MoveImeCarets(int offset);
 	void DrawImeIndicator(int indicator, int len);
-	Scintilla::KeyMod ModifiersOfKeyboard() const;
+	static Scintilla::KeyMod ModifiersOfKeyboard();
 };
 
 #endif /* SCINTILLAEDITBASE_H */
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index 2f478493e..622868dec 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -172,7 +172,7 @@ static QString StringFromSelectedText(const SelectionText &selectedText)
 	}
 }
 
-static void AddRectangularToMime(QMimeData *mimeData, [[maybe_unused]] QString su)
+static void AddRectangularToMime(QMimeData *mimeData, [[maybe_unused]] const QString &su)
 {
 #if defined(Q_OS_WIN)
 	// Add an empty marker