summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase/vcsplugin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/vcsbase/vcsplugin.cpp')
-rw-r--r--src/plugins/vcsbase/vcsplugin.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp
index 43d17145de..4ac28c46c2 100644
--- a/src/plugins/vcsbase/vcsplugin.cpp
+++ b/src/plugins/vcsbase/vcsplugin.cpp
@@ -28,7 +28,7 @@
#include "vcsbaseconstants.h"
#include "vcsbasesubmiteditor.h"
-#include "commonsettingspage.h"
+#include "commonvcssettings.h"
#include "nicknamedialog.h"
#include "vcsoutputwindow.h"
#include "wizard/vcscommandpage.h"
@@ -140,7 +140,7 @@ VcsPlugin *VcsPlugin::instance()
return m_instance;
}
-CommonVcsSettings VcsPlugin::settings() const
+CommonVcsSettings &VcsPlugin::settings() const
{
return d->m_settingsPage.settings();
}
@@ -158,7 +158,7 @@ QStandardItemModel *VcsPlugin::nickNameModel()
void VcsPlugin::populateNickNameModel()
{
QString errorMessage;
- if (!NickNameDialog::populateModelFromMailCapFile(settings().nickNameMailMap,
+ if (!NickNameDialog::populateModelFromMailCapFile(settings().nickNameMailMap.value(),
d->m_nickNameModel,
&errorMessage)) {
qWarning("%s", qPrintable(errorMessage));