diff options
author | Neil <nyamatongwe@gmail.com> | 2021-10-25 20:00:07 +1100 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2021-10-25 20:00:07 +1100 |
commit | a892e1ffca62df1b8400e339750c91c4fc6c65bd (patch) | |
tree | ab1040b0f5887b2fb7cbac2f66ad2efaf8c0958d /qt | |
parent | 83b67c1d70ac48dd242e7a7d6d248e26cddc69e4 (diff) | |
download | scintilla-mirror-a892e1ffca62df1b8400e339750c91c4fc6c65bd.tar.gz |
Don't define destructors when not needed, use unique_ptr, explict constructors.
Diffstat (limited to 'qt')
-rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.cpp | 4 | ||||
-rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 15 | ||||
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 2 |
3 files changed, 5 insertions, 16 deletions
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp index 8d50eabdb..251a5e557 100644 --- a/qt/ScintillaEdit/ScintillaDocument.cpp +++ b/qt/ScintillaEdit/ScintillaDocument.cpp @@ -48,7 +48,6 @@ class WatcherHelper : public DocWatcher { ScintillaDocument *owner; public: explicit WatcherHelper(ScintillaDocument *owner_); - virtual ~WatcherHelper(); void NotifyModifyAttempt(Document *doc, void *userData) override; void NotifySavePoint(Document *doc, void *userData, bool atSavePoint) override; @@ -62,9 +61,6 @@ public: WatcherHelper::WatcherHelper(ScintillaDocument *owner_) : owner(owner_) { } -WatcherHelper::~WatcherHelper() { -} - void WatcherHelper::NotifyModifyAttempt(Document *, void *) { emit owner->modify_attempt(); } diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index 3887e44a5..e346acb9a 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -116,9 +116,9 @@ static QFont::StyleStrategy ChooseStrategy(FontQuality eff) class FontAndCharacterSet : public Font { public: CharacterSet characterSet = CharacterSet::Ansi; - QFont *pfont = nullptr; - FontAndCharacterSet(const FontParameters &fp) { - pfont = new QFont; + std::unique_ptr<QFont> pfont; + explicit FontAndCharacterSet(const FontParameters &fp) { + pfont = std::make_unique<QFont>(); pfont->setStyleStrategy(ChooseStrategy(fp.extraFontFlag)); pfont->setFamily(QString::fromUtf8(fp.faceName)); pfont->setPointSizeF(fp.size); @@ -127,10 +127,6 @@ public: characterSet = fp.characterSet; } - ~FontAndCharacterSet() { - delete pfont; - pfont = nullptr; - } }; namespace { @@ -148,7 +144,7 @@ const FontAndCharacterSet *AsFontAndCharacterSet(const Font *f) { QFont *FontPointer(const Font *f) { - return AsFontAndCharacterSet(f)->pfont; + return AsFontAndCharacterSet(f)->pfont.get(); } } @@ -921,7 +917,6 @@ PRectangle Window::GetMonitorRect(Point pt) class ListWidget : public QListWidget { public: explicit ListWidget(QWidget *parent); - virtual ~ListWidget(); void setDelegate(IListBoxDelegate *lbDelegate); @@ -939,7 +934,6 @@ private: class ListBoxImpl : public ListBox { public: ListBoxImpl() noexcept; - ~ListBoxImpl() noexcept override = default; void SetFont(const Font *font) override; void Create(Window &parent, int ctrlID, Point location, @@ -1220,7 +1214,6 @@ std::unique_ptr<ListBox> ListBox::Allocate() ListWidget::ListWidget(QWidget *parent) : QListWidget(parent), delegate(nullptr) {} -ListWidget::~ListWidget() {} void ListWidget::setDelegate(IListBoxDelegate *lbDelegate) { diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index e7591787e..2bc2957f8 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -677,7 +677,7 @@ void ScintillaQt::StartDrag() class CallTipImpl : public QWidget { public: - CallTipImpl(CallTip *pct_) + explicit CallTipImpl(CallTip *pct_) : QWidget(nullptr, Qt::ToolTip), pct(pct_) { |