forked from qt-creator/qt-creator
Remove NULL tests for Core::ICore::settings()
It cannot really be NULL Change-Id: I7231e00754464347dc5750249f751cda7f831930 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -257,8 +257,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
|
||||
if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.subversion/Subversion.mimetypes.xml"), errorMessage))
|
||||
return false;
|
||||
|
||||
if (QSettings *settings = Core::ICore::settings())
|
||||
m_settings.fromSettings(settings);
|
||||
m_settings.fromSettings(Core::ICore::settings());
|
||||
|
||||
addAutoReleasedObject(new SettingsPage);
|
||||
|
||||
@@ -1180,8 +1179,7 @@ void SubversionPlugin::setSettings(const SubversionSettings &s)
|
||||
{
|
||||
if (s != m_settings) {
|
||||
m_settings = s;
|
||||
if (QSettings *settings = Core::ICore::settings())
|
||||
m_settings.toSettings(settings);
|
||||
m_settings.toSettings(Core::ICore::settings());
|
||||
subVersionControl()->emitConfigurationChanged();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user