Ticket #4826: libs_libmyth_mythcontext.cpp-d-check-is-useless.patch

File libs_libmyth_mythcontext.cpp-d-check-is-useless.patch, 1.2 KB (added by Erik Hovland <erik@…>, 18 years ago)

removes useless d null pointer checks

  • libs/libmyth/mythcontext.cpp 

    Since d is allocated in the ctor with new its existance is guarenteed and

From: Erik Hovland <erik@hovland.org>

we don't need to check for null.
---

 libs/libmyth/mythcontext.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/libmyth/mythcontext.cpp b/libs/libmyth/mythcontext.cpp
index 891c237..6efaa59 100644
    a b QString MythContext::GetSetting(const QString &key, const QString &defaultval)  
    26642664    bool found = false;
    26652665    QString value;
    26662666
    2667     if (d && d->overriddenSettings.contains(key)) {
     2667    if (d->overriddenSettings.contains(key)) {
    26682668        value = d->overriddenSettings[key];
    26692669        return value;
    26702670    }
    26712671
    2672     if (d && d->useSettingsCache)
     2672    if (d->useSettingsCache)
    26732673    {
    26742674        d->settingsCacheLock.lock();
    26752675        if (d->settingsCache.contains(key))
    … … QString MythContext::GetSetting(const QString &key, const QString &defaultval)  
    27212721    if (!found)
    27222722        value = d->m_settings->GetSetting(key, defaultval);
    27232723
    2724     if (!value.isNull() && d && d->useSettingsCache)
     2724    if (!value.isNull() && d->useSettingsCache)
    27252725    {
    27262726        d->settingsCacheLock.lock();
    27272727        d->settingsCache[key] = value;