Commit f8c1a216 authored by Laurent Montel's avatar Laurent Montel 😁

Astyle kdelibs

parent 29b8cd62
......@@ -45,7 +45,7 @@ public:
void readConfig();
void writeConfig();
void addServerConfig();
void addServerConfig();
void deleteServerConfig(QListWidgetItem *item);
public Q_SLOTS:
......
......@@ -93,7 +93,6 @@ ServerSieveSettings::ServerSieveSettings(QWidget *parent) :
ui->safeImapGroup->setId(ui->sslRadio, KSieveUi::SieveImapAccountSettings::AnySslVersion);
ui->safeImapGroup->setId(ui->tlsRadio, KSieveUi::SieveImapAccountSettings::TlsV1);
connect(ui->testButton, &QPushButton::pressed, this, &ServerSieveSettings::slotTest);
populateDefaultComboBoxAuthenticationOptions();
......@@ -106,7 +105,6 @@ ServerSieveSettings::~ServerSieveSettings()
delete ui;
}
void ServerSieveSettings::populateDefaultComboBoxAuthenticationOptions()
{
populateDefaultAuthenticationOptions(ui->authenticationCombo);
......
......@@ -27,7 +27,8 @@ namespace Ui
{
class ServerSieveSettings;
}
namespace MailTransport {
namespace MailTransport
{
class ServerTest;
}
class QComboBox;
......
......@@ -99,7 +99,7 @@ private Q_SLOTS:
void slotGetResult(KManageSieve::SieveJob *, bool success, const QString &script, bool isActive);
void slotCheckSyntaxClicked();
void slotPutResult(KManageSieve::SieveJob *, bool success);
void slotValueChanged(bool b);
void slotValueChanged(bool b);
void slotCheckScriptJobFinished(const QString &errorMsg, bool success);
private:
......
......@@ -102,9 +102,9 @@ QVector<SieveEditorUtil::SieveServerConfig> SieveEditorUtil::readServerSieveConf
sieve.sieveImapAccountSettings.setServerName(group.readEntry(QStringLiteral("ImapServerName")));
sieve.sieveImapAccountSettings.setUserName(group.readEntry(QStringLiteral("ImapUserName")));
sieve.sieveImapAccountSettings.setAuthenticationType(
static_cast<KSieveUi::SieveImapAccountSettings::AuthenticationMode>(group.readEntry(QStringLiteral("ImapAuthentication"), static_cast<int>(KSieveUi::SieveImapAccountSettings::Plain))));
static_cast<KSieveUi::SieveImapAccountSettings::AuthenticationMode>(group.readEntry(QStringLiteral("ImapAuthentication"), static_cast<int>(KSieveUi::SieveImapAccountSettings::Plain))));
sieve.sieveImapAccountSettings.setEncryptionMode(
static_cast<KSieveUi::SieveImapAccountSettings::EncryptionMode>(group.readEntry(QStringLiteral("ImapEncrypt"), static_cast<int>(KSieveUi::SieveImapAccountSettings::TlsV1))));
static_cast<KSieveUi::SieveImapAccountSettings::EncryptionMode>(group.readEntry(QStringLiteral("ImapEncrypt"), static_cast<int>(KSieveUi::SieveImapAccountSettings::TlsV1))));
if (!sieve.sieveImapAccountSettings.userName().isEmpty() &&
!sieve.sieveImapAccountSettings.serverName().isEmpty() &&
......@@ -180,7 +180,6 @@ void SieveEditorUtil::writeSieveSettings(KWallet::Wallet *wallet, const KSharedC
}
group.writeEntry(QStringLiteral("Authentication"), static_cast<int>(conf.sieveSettings.authenticationType));
//Imap Account Settings
group.writeEntry(QStringLiteral("ImapPort"), conf.sieveImapAccountSettings.port());
group.writeEntry(QStringLiteral("ImapAuthentication"), static_cast<int>(conf.sieveImapAccountSettings.authenticationType()));
......@@ -216,7 +215,6 @@ void SieveEditorUtil::addServerSieveConfig(const SieveEditorUtil::SieveServerCon
cfg->sync();
}
void SieveEditorUtil::deletePasswords(const QStringList &identifiers)
{
if (!identifiers.isEmpty()) {
......
......@@ -30,8 +30,7 @@ class Wallet;
}
namespace SieveEditorUtil
{
struct SieveAccountSettings
{
struct SieveAccountSettings {
SieveAccountSettings()
: authenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN),
port(-1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment