mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Remove some redundant .get()s

Browse source
This commit is contained in:
Thomas Goyne 2014-11-04 08:27:36 -08:00
parent def24c25b3
commit 7300a1bf2d
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libaegisub/common/thesaurus.cpp
View file

@ -53,7 +53,7 @@ Thesaurus::~Thesaurus() { }
std::vector<Thesaurus::Entry> Thesaurus::Lookup(std::string const& word) { std::vector<Thesaurus::Entry> Thesaurus::Lookup(std::string const& word) {
std::vector<Entry> out; std::vector<Entry> out;
if (!dat.get()) return out; if (!dat) return out;
auto it = offsets.find(word); auto it = offsets.find(word);
if (it == offsets.end()) return out; if (it == offsets.end()) return out;

2
src/ass_override.cpp
View file

@ -109,7 +109,7 @@ template<> agi::Color AssOverrideParameter::Get<agi::Color>() const {
} }
template<> AssDialogueBlockOverride *AssOverrideParameter::Get<AssDialogueBlockOverride*>() const { template<> AssDialogueBlockOverride *AssOverrideParameter::Get<AssDialogueBlockOverride*>() const {
if (!block.get()) { if (!block) {
block = agi::make_unique<AssDialogueBlockOverride>(Get<std::string>()); block = agi::make_unique<AssDialogueBlockOverride>(Get<std::string>());
block->ParseTags(); block->ParseTags();
} }

2
src/dialog_spellchecker.cpp
View file

@ -139,7 +139,7 @@ DialogSpellChecker::DialogSpellChecker(agi::Context *context)
// List of supported spellchecker languages // List of supported spellchecker languages
{ {
if (!spellchecker.get()) { if (!spellchecker) {
wxMessageBox("No spellchecker available.", "Error", wxOK | wxICON_ERROR | wxCENTER); wxMessageBox("No spellchecker available.", "Error", wxOK | wxICON_ERROR | wxCENTER);
throw agi::UserCancelException("No spellchecker available"); throw agi::UserCancelException("No spellchecker available");
} }

2
src/thesaurus.cpp
View file

@ -46,7 +46,7 @@ Thesaurus::~Thesaurus() {
} }
std::vector<Thesaurus::Entry> Thesaurus::Lookup(std::string word) { std::vector<Thesaurus::Entry> Thesaurus::Lookup(std::string word) {
if (!impl.get()) return {}; if (!impl) return {};
boost::to_lower(word); boost::to_lower(word);
return impl->Lookup(word); return impl->Lookup(word);
} }

2
src/tooltip_manager.cpp
View file

@ -61,7 +61,7 @@ void ToolTipManager::Bind(wxWindow *window, wxString tooltip, const char *contex
} }
void ToolTipBinding::Update() { void ToolTipBinding::Update() {
if (!window.get()) return; if (!window) return;
std::vector<std::string> hotkeys = hotkey::get_hotkey_strs(context, command); std::vector<std::string> hotkeys = hotkey::get_hotkey_strs(context, command);

2
src/video_display.cpp
View file

@ -368,7 +368,7 @@ void VideoDisplay::OnMouseWheel(wxMouseEvent& event) {
} }
void VideoDisplay::OnContextMenu(wxContextMenuEvent&) { 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); SetCursor(wxNullCursor);
menu::OpenPopupMenu(context_menu.get(), this); menu::OpenPopupMenu(context_menu.get(), this);
} }