summaryrefslogtreecommitdiff
path: root/src/plugins/cvs
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-05-28 15:17:20 +0200
committerhjk <hjk121@nokiamail.com>2013-05-29 09:40:17 +0200
commit8390a321319f1fdf8c92ae40408ee6db02b75908 (patch)
tree775d71982425eac82b00aaeb493ba81481908582 /src/plugins/cvs
parent0b225af84c6377416959ae2174823c8f1e9e7073 (diff)
downloadqt-creator-8390a321319f1fdf8c92ae40408ee6db02b75908.tar.gz
Settings: Simplify some user code
This is still way too much boiler plate code for the task at hand. Change-Id: Ia03bff3d6947ea6372e3f5d0217c116728742b74 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/cvs')
-rw-r--r--src/plugins/cvs/cvsplugin.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 00454c6089..b3cadb5e17 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -233,8 +233,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
if (!ICore::mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.cvs/CVS.mimetypes.xml"), errorMessage))
return false;
- if (QSettings *settings = ICore::settings())
- m_settings.fromSettings(settings);
+ m_settings.fromSettings(ICore::settings());
addAutoReleasedObject(new SettingsPage);
@@ -1299,8 +1298,7 @@ void CvsPlugin::setSettings(const CvsSettings &s)
{
if (s != m_settings) {
m_settings = s;
- if (QSettings *settings = ICore::settings())
- m_settings.toSettings(settings);
+ m_settings.toSettings(ICore::settings());
cvsVersionControl()->emitConfigurationChanged();
}
}