From 7300a1bf2db42263dbaf16cf6a5e417449bc3b5d Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 4 Nov 2014 08:27:36 -0800 Subject: [PATCH] Remove some redundant .get()s --- libaegisub/common/thesaurus.cpp | 2 +- src/ass_override.cpp | 2 +- src/dialog_spellchecker.cpp | 2 +- src/thesaurus.cpp | 2 +- src/tooltip_manager.cpp | 2 +- src/video_display.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libaegisub/common/thesaurus.cpp b/libaegisub/common/thesaurus.cpp index 36212dfbe..b56aac054 100644 --- a/libaegisub/common/thesaurus.cpp +++ b/libaegisub/common/thesaurus.cpp @@ -53,7 +53,7 @@ Thesaurus::~Thesaurus() { } std::vector Thesaurus::Lookup(std::string const& word) { std::vector 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 94cc5ccf3..774c93a77 100644 --- a/src/ass_override.cpp +++ b/src/ass_override.cpp @@ -109,7 +109,7 @@ template<> agi::Color AssOverrideParameter::Get() const { } template<> AssDialogueBlockOverride *AssOverrideParameter::Get() const { - if (!block.get()) { + if (!block) { block = agi::make_unique(Get()); block->ParseTags(); } diff --git a/src/dialog_spellchecker.cpp b/src/dialog_spellchecker.cpp index 88e0595e6..1d6fa316f 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 025110a08..415c59ed4 100644 --- a/src/thesaurus.cpp +++ b/src/thesaurus.cpp @@ -46,7 +46,7 @@ Thesaurus::~Thesaurus() { } std::vector 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 4029119da..5c381e0d6 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 hotkeys = hotkey::get_hotkey_strs(context, command); diff --git a/src/video_display.cpp b/src/video_display.cpp index 7a3931890..083307185 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); }