diff --git a/libaegisub/common/thesaurus.cpp b/libaegisub/common/thesaurus.cpp index 36212dfbefc7f1c6fbdf73858f440009dafda53d..b56aac054a33d21f8dad10657a8c8f2972787546 100644 --- a/libaegisub/common/thesaurus.cpp +++ b/libaegisub/common/thesaurus.cpp @@ -53,7 +53,7 @@ Thesaurus::~Thesaurus() { } std::vector<Thesaurus::Entry> Thesaurus::Lookup(std::string const& word) { std::vector<Entry> out; - if (!dat.get()) return out; + if (!dat) return out; auto it = offsets.find(word); if (it == offsets.end()) return out; diff --git a/src/ass_override.cpp b/src/ass_override.cpp index 94cc5ccf36cdc6672890c75aba8ccfb186215d53..774c93a77c9112dd64d203a8407b839f11dbaaa1 100644 --- a/src/ass_override.cpp +++ b/src/ass_override.cpp @@ -109,7 +109,7 @@ template<> agi::Color AssOverrideParameter::Get<agi::Color>() const { } template<> AssDialogueBlockOverride *AssOverrideParameter::Get<AssDialogueBlockOverride*>() const { - if (!block.get()) { + if (!block) { block = agi::make_unique<AssDialogueBlockOverride>(Get<std::string>()); block->ParseTags(); } diff --git a/src/dialog_spellchecker.cpp b/src/dialog_spellchecker.cpp index 88e0595e6e7606f538e21da671aeb1e22ce3afc2..1d6fa316fb995a3edf73acef8d73b845f73f49ec 100644 --- a/src/dialog_spellchecker.cpp +++ b/src/dialog_spellchecker.cpp @@ -139,7 +139,7 @@ DialogSpellChecker::DialogSpellChecker(agi::Context *context) // List of supported spellchecker languages { - if (!spellchecker.get()) { + if (!spellchecker) { wxMessageBox("No spellchecker available.", "Error", wxOK | wxICON_ERROR | wxCENTER); throw agi::UserCancelException("No spellchecker available"); } diff --git a/src/thesaurus.cpp b/src/thesaurus.cpp index 025110a0870dd85feff17f541f0f823b3533bc5b..415c59ed4fa82b052ced02c7143475fa8f231fa9 100644 --- a/src/thesaurus.cpp +++ b/src/thesaurus.cpp @@ -46,7 +46,7 @@ Thesaurus::~Thesaurus() { } std::vector<Thesaurus::Entry> Thesaurus::Lookup(std::string word) { - if (!impl.get()) return {}; + if (!impl) return {}; boost::to_lower(word); return impl->Lookup(word); } diff --git a/src/tooltip_manager.cpp b/src/tooltip_manager.cpp index 4029119daa449a12d4826f4307f60f24690f4c80..5c381e0d6ae6fcaa3b42fb1de44780df4e158f88 100644 --- a/src/tooltip_manager.cpp +++ b/src/tooltip_manager.cpp @@ -61,7 +61,7 @@ void ToolTipManager::Bind(wxWindow *window, wxString tooltip, const char *contex } void ToolTipBinding::Update() { - if (!window.get()) return; + if (!window) return; std::vector<std::string> hotkeys = hotkey::get_hotkey_strs(context, command); diff --git a/src/video_display.cpp b/src/video_display.cpp index 7a3931890cb2e26fbc41b4f413bc5a93fd5ebefe..083307185e9ca6796c7c89346b978b87fd0b09c0 100644 --- a/src/video_display.cpp +++ b/src/video_display.cpp @@ -368,7 +368,7 @@ void VideoDisplay::OnMouseWheel(wxMouseEvent& event) { } void VideoDisplay::OnContextMenu(wxContextMenuEvent&) { - if (!context_menu.get()) context_menu = menu::GetMenu("video_context", con); + if (!context_menu) context_menu = menu::GetMenu("video_context", con); SetCursor(wxNullCursor); menu::OpenPopupMenu(context_menu.get(), this); }