Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
KDE PIM Add-ons
Commits
e8a9a0e9
Commit
e8a9a0e9
authored
Oct 06, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid potential problem about config name
parent
6177f693
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
50 additions
and
27 deletions
+50
-27
kaddressbook/plugins/checkgravatar/gravatar/widgets/gravatarupdatedialog.cpp
...s/checkgravatar/gravatar/widgets/gravatarupdatedialog.cpp
+5
-3
kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp
...book/plugins/mergelib/manualmerge/mergecontactsdialog.cpp
+5
-2
kaddressbook/plugins/mergelib/searchduplicate/searchandmergecontactduplicatecontactdialog.cpp
...duplicate/searchandmergecontactduplicatecontactdialog.cpp
+5
-3
kmail/editorconvertertextplugins/markdown/markdownlib/markdownconfigurewidget.cpp
...tplugins/markdown/markdownlib/markdownconfigurewidget.cpp
+5
-2
kmail/editorplugins/insertemail/selectmaildialog.cpp
kmail/editorplugins/insertemail/selectmaildialog.cpp
+5
-2
kmail/editorplugins/insertshorturl/insertshorturlconfigurewidget.cpp
...rplugins/insertshorturl/insertshorturlconfigurewidget.cpp
+5
-3
kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp
...resend/configurewidget/checkbeforesendconfigurewidget.cpp
+5
-3
kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp
...dcheckplugins/confirm-address/confirmaddressinterface.cpp
+5
-3
kmail/grammarplugins/grammalecte/src/grammalectemanager.cpp
kmail/grammarplugins/grammalecte/src/grammalectemanager.cpp
+5
-3
kmail/grammarplugins/languagetool/src/languagetoolmanager.cpp
...l/grammarplugins/languagetool/src/languagetoolmanager.cpp
+5
-3
No files found.
kaddressbook/plugins/checkgravatar/gravatar/widgets/gravatarupdatedialog.cpp
View file @
e8a9a0e9
...
...
@@ -14,7 +14,9 @@
#include <QPushButton>
using
namespace
KABGravatar
;
namespace
{
static
const
char
myConfigGroupName
[]
=
"GravatarUpdateDialog"
;
}
GravatarUpdateDialog
::
GravatarUpdateDialog
(
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
@@ -96,7 +98,7 @@ void GravatarUpdateDialog::setOriginalPixmap(const QPixmap &pix)
void
GravatarUpdateDialog
::
readConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"GravatarUpdateDialog"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
const
QSize
size
=
grp
.
readEntry
(
"Size"
,
QSize
(
300
,
200
));
if
(
size
.
isValid
())
{
resize
(
size
);
...
...
@@ -105,7 +107,7 @@ void GravatarUpdateDialog::readConfig()
void
GravatarUpdateDialog
::
writeConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"GravatarUpdateDialog"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
"Size"
,
size
());
grp
.
sync
();
}
kaddressbook/plugins/mergelib/manualmerge/mergecontactsdialog.cpp
View file @
e8a9a0e9
...
...
@@ -23,6 +23,9 @@
#include <QStackedWidget>
using
namespace
KABMergeContacts
;
namespace
{
static
const
char
myConfigGroupName
[]
=
"MergeContactsDialog"
;
}
MergeContactsDialog
::
MergeContactsDialog
(
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
@@ -89,7 +92,7 @@ void MergeContactsDialog::slotCustomizeMergeContact(const Akonadi::Item::List &l
void
MergeContactsDialog
::
readConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"MergeContactsDialog"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
const
QSize
size
=
grp
.
readEntry
(
"Size"
,
QSize
(
300
,
200
));
if
(
size
.
isValid
())
{
resize
(
size
);
...
...
@@ -98,7 +101,7 @@ void MergeContactsDialog::readConfig()
void
MergeContactsDialog
::
writeConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"MergeContactsDialog"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
"Size"
,
size
());
grp
.
sync
();
}
...
...
kaddressbook/plugins/mergelib/searchduplicate/searchandmergecontactduplicatecontactdialog.cpp
View file @
e8a9a0e9
...
...
@@ -22,7 +22,9 @@
#include <QVBoxLayout>
using
namespace
KABMergeContacts
;
namespace
{
static
const
char
myConfigGroupName
[]
=
"SearchAndMergeContactDuplicateContactDialog"
;
}
SearchAndMergeContactDuplicateContactDialog
::
SearchAndMergeContactDuplicateContactDialog
(
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
@@ -91,7 +93,7 @@ void SearchAndMergeContactDuplicateContactDialog::searchPotentialDuplicateContac
void
SearchAndMergeContactDuplicateContactDialog
::
readConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"MergeContactDuplicateContactDialog"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
const
QSize
size
=
grp
.
readEntry
(
"Size"
,
QSize
(
300
,
200
));
if
(
size
.
isValid
())
{
resize
(
size
);
...
...
@@ -100,7 +102,7 @@ void SearchAndMergeContactDuplicateContactDialog::readConfig()
void
SearchAndMergeContactDuplicateContactDialog
::
writeConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"MergeContactDuplicateContactDialog"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
"Size"
,
size
());
grp
.
sync
();
}
...
...
kmail/editorconvertertextplugins/markdown/markdownlib/markdownconfigurewidget.cpp
View file @
e8a9a0e9
...
...
@@ -10,6 +10,9 @@
#include <KSharedConfig>
#include <QCheckBox>
#include <QVBoxLayout>
namespace
{
static
const
char
myConfigGroupName
[]
=
"Markdown"
;
}
MarkdownConfigureWidget
::
MarkdownConfigureWidget
(
QWidget
*
parent
)
:
MessageComposer
::
PluginEditorConvertTextConfigureWidget
(
parent
)
{
...
...
@@ -33,14 +36,14 @@ MarkdownConfigureWidget::~MarkdownConfigureWidget()
void
MarkdownConfigureWidget
::
loadSettings
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"Markdown"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
mLatexSupport
->
setChecked
(
grp
.
readEntry
(
"Enable Embedded Latex"
,
false
));
mExtraDefinitionLists
->
setChecked
(
grp
.
readEntry
(
"Enable Extra Definition Lists"
,
false
));
}
void
MarkdownConfigureWidget
::
saveSettings
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"Markdown"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
"Enable Embedded Latex"
,
mLatexSupport
->
isChecked
());
grp
.
writeEntry
(
"Enable Extra Definition Lists"
,
mExtraDefinitionLists
->
isChecked
());
}
...
...
kmail/editorplugins/insertemail/selectmaildialog.cpp
View file @
e8a9a0e9
...
...
@@ -11,6 +11,9 @@
#include <KConfigGroup>
#include <KSharedConfig>
namespace
{
static
const
char
myConfigGroupName
[]
=
"SelectMailDialog"
;
}
SelectMailDialog
::
SelectMailDialog
(
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
@@ -46,7 +49,7 @@ void SelectMailDialog::accept()
void
SelectMailDialog
::
readConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"SelectMailDialog"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
const
QSize
size
=
grp
.
readEntry
(
"Size"
,
QSize
(
300
,
200
));
if
(
size
.
isValid
())
{
resize
(
size
);
...
...
@@ -55,7 +58,7 @@ void SelectMailDialog::readConfig()
void
SelectMailDialog
::
writeConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"SelectMailDialog"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
"Size"
,
size
());
grp
.
sync
();
}
kmail/editorplugins/insertshorturl/insertshorturlconfigurewidget.cpp
View file @
e8a9a0e9
...
...
@@ -14,7 +14,9 @@
#include <QComboBox>
#include <QLabel>
#include <QVBoxLayout>
namespace
{
static
const
char
myConfigGroupName
[]
=
"ShortUrl"
;
}
InsertShorturlConfigureWidget
::
InsertShorturlConfigureWidget
(
QWidget
*
parent
)
:
QWidget
(
parent
)
{
...
...
@@ -49,7 +51,7 @@ void InsertShorturlConfigureWidget::slotChanged()
void
InsertShorturlConfigureWidget
::
loadConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"ShortUrl"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
const
QString
engineName
=
grp
.
readEntry
(
"EngineName"
);
int
index
=
mShortUrlServer
->
findData
(
engineName
);
if
(
index
<
0
)
{
...
...
@@ -62,7 +64,7 @@ void InsertShorturlConfigureWidget::loadConfig()
void
InsertShorturlConfigureWidget
::
writeConfig
()
{
if
(
mChanged
)
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"ShortUrl"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
"EngineName"
,
mShortUrlServer
->
itemData
(
mShortUrlServer
->
currentIndex
()).
toString
());
grp
.
sync
();
}
...
...
kmail/editorsendcheckplugins/checkbeforesend/configurewidget/checkbeforesendconfigurewidget.cpp
View file @
e8a9a0e9
...
...
@@ -10,7 +10,9 @@
#include <QCheckBox>
#include <KConfigGroup>
#include <KSharedConfig>
namespace
{
static
const
char
myConfigGroupName
[]
=
"Check Before Send"
;
}
CheckBeforeSendConfigureWidget
::
CheckBeforeSendConfigureWidget
(
QWidget
*
parent
)
:
MessageComposer
::
PluginEditorCheckBeforeSendConfigureWidget
(
parent
)
{
...
...
@@ -47,7 +49,7 @@ CheckBeforeSendConfigureWidget::~CheckBeforeSendConfigureWidget()
void
CheckBeforeSendConfigureWidget
::
loadSettings
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"Check Before Send"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
mCheckPlainTextMail
->
setChecked
(
grp
.
readEntry
(
"SendPlainText"
,
false
));
mCheckMailTransport
->
setChecked
(
grp
.
readEntry
(
"SmtpDefinedInIdentity"
,
false
));
mCheckDuplicateEmailsAddresses
->
setChecked
(
grp
.
readEntry
(
"CheckDuplicatedEmails"
,
false
));
...
...
@@ -56,7 +58,7 @@ void CheckBeforeSendConfigureWidget::loadSettings()
void
CheckBeforeSendConfigureWidget
::
saveSettings
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"Check Before Send"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
"SendPlainText"
,
mCheckPlainTextMail
->
isChecked
());
grp
.
writeEntry
(
"SmtpDefinedInIdentity"
,
mCheckMailTransport
->
isChecked
());
grp
.
writeEntry
(
"CheckDuplicatedEmails"
,
mCheckDuplicateEmailsAddresses
->
isChecked
());
...
...
kmail/editorsendcheckplugins/confirm-address/confirmaddressinterface.cpp
View file @
e8a9a0e9
...
...
@@ -17,7 +17,9 @@
#include <KIdentityManagement/Identity>
#include <MessageComposer/AliasesExpandJob>
#include <PimCommon/PimUtil>
namespace
{
static
const
char
myConfigGroupName
[]
=
"Confirm Address"
;
}
ConfirmAddressInterface
::
ConfirmAddressInterface
(
QObject
*
parent
)
:
MessageComposer
::
PluginEditorCheckBeforeSendInterface
(
parent
)
{
...
...
@@ -82,7 +84,7 @@ bool ConfirmAddressInterface::exec(const MessageComposer::PluginEditorCheckBefor
void
ConfirmAddressInterface
::
slotAddWhiteListEmails
(
const
QStringList
&
lst
,
uint
currentIdentity
)
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"
Confi
rm Address"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
my
Confi
gGroupName
);
KConfigGroup
identityGroup
=
grp
.
group
(
QStringLiteral
(
"Confirm Address %1"
).
arg
(
currentIdentity
));
QStringList
oldWhiteList
=
identityGroup
.
readEntry
(
"Emails"
,
QStringList
());
for
(
const
QString
&
email
:
lst
)
{
...
...
@@ -97,7 +99,7 @@ void ConfirmAddressInterface::slotAddWhiteListEmails(const QStringList &lst, uin
void
ConfirmAddressInterface
::
reloadConfig
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"
Confi
rm Address"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
my
Confi
gGroupName
);
mHashSettings
.
clear
();
KIdentityManagement
::
IdentityManager
*
im
=
KIdentityManagement
::
IdentityManager
::
self
();
...
...
kmail/grammarplugins/grammalecte/src/grammalectemanager.cpp
View file @
e8a9a0e9
...
...
@@ -8,7 +8,9 @@
#include <KConfigGroup>
#include <KSharedConfig>
#include <QStandardPaths>
namespace
{
static
const
char
myConfigGroupName
[]
=
"Grammalecte"
;
}
GrammalecteManager
::
GrammalecteManager
(
QObject
*
parent
)
:
QObject
(
parent
)
{
...
...
@@ -27,7 +29,7 @@ GrammalecteManager *GrammalecteManager::self()
void
GrammalecteManager
::
saveSettings
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"Grammalecte"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
QStringLiteral
(
"pythonpath"
),
mPythonPath
);
grp
.
writeEntry
(
QStringLiteral
(
"grammalectepath"
),
mGrammalectePath
);
grp
.
writeEntry
(
QStringLiteral
(
"options"
),
mOptions
);
...
...
@@ -45,7 +47,7 @@ void GrammalecteManager::setOptions(const QStringList &saveOptions)
void
GrammalecteManager
::
loadSettings
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"Grammalecte"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
mPythonPath
=
grp
.
readEntry
(
QStringLiteral
(
"pythonpath"
));
if
(
mPythonPath
.
isEmpty
())
{
mPythonPath
=
QStandardPaths
::
findExecutable
(
QStringLiteral
(
"python3"
));
...
...
kmail/grammarplugins/languagetool/src/languagetoolmanager.cpp
View file @
e8a9a0e9
...
...
@@ -11,7 +11,9 @@
#include <QNetworkAccessManager>
#include <QColor>
#include <QRandomGenerator>
namespace
{
static
const
char
myConfigGroupName
[]
=
"LanguageTool"
;
}
LanguageToolManager
::
LanguageToolManager
(
QObject
*
parent
)
:
QObject
(
parent
)
,
mNetworkAccessManager
(
new
QNetworkAccessManager
(
this
))
...
...
@@ -82,7 +84,7 @@ void LanguageToolManager::setLanguageToolPath(const QString &path)
void
LanguageToolManager
::
loadSettings
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"LanguageTool"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
mLanguageToolPath
=
grp
.
readEntry
(
QStringLiteral
(
"languagetoolpath"
),
QStringLiteral
(
"https://languagetool.org/api/v2"
));
mLanguage
=
grp
.
readEntry
(
QStringLiteral
(
"language"
),
QStringLiteral
(
"en"
));
mUseLocalInstance
=
grp
.
readEntry
(
QStringLiteral
(
"useLocalInstance"
),
false
);
...
...
@@ -91,7 +93,7 @@ void LanguageToolManager::loadSettings()
void
LanguageToolManager
::
saveSettings
()
{
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
"LanguageTool"
);
KConfigGroup
grp
(
KSharedConfig
::
openConfig
(),
myConfigGroupName
);
grp
.
writeEntry
(
QStringLiteral
(
"languagetoolpath"
),
mLanguageToolPath
);
grp
.
writeEntry
(
QStringLiteral
(
"language"
),
mLanguage
);
grp
.
writeEntry
(
QStringLiteral
(
"useLocalInstance"
),
mUseLocalInstance
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment