Commit 0bb6cda4 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Remove return value

parent 4a17e055
Pipeline #40783 canceled with stage
in 4 minutes and 49 seconds
......@@ -63,20 +63,18 @@ void ImportImapSettingsAkonadiCheckJob::loadSieveServerSettings()
QMapIterator<QString, QString> i(mSieveServerLst);
while (i.hasNext()) {
i.next();
if (importSettings(i.key(), i.value())) {
mSettingsWereImported = true;
}
importSettings(i.key(), i.value());
}
checkNoSettingsImported();
}
bool ImportImapSettingsAkonadiCheckJob::importSettings(const QString &directory, const QString &filename)
void ImportImapSettingsAkonadiCheckJob::importSettings(const QString &directory, const QString &filename)
{
const QString filePath = directory + QLatin1Char('/') + filename;
//qCDebug(SIEVEEDITOR_LOG) << "importSettings filename:" << filePath;
if (!QFileInfo::exists(filePath)) {
qCWarning(SIEVEEDITOR_LOG) << "Unable to open file " << filePath;
return false;
return;
}
SieveEditorUtil::SieveServerConfig config;
const bool isKolabSettings = filePath.contains(QLatin1String("/akonadi_kolab_resource"));
......@@ -133,10 +131,9 @@ bool ImportImapSettingsAkonadiCheckJob::importSettings(const QString &directory,
mPasswordImporter->importPasswords(config, filename, reuseImapSettings);
if (config.isValid()) {
Q_EMIT importSetting(filename, config);
return true;
mSettingsWereImported = true;
}
}
return false;
}
bool ImportImapSettingsAkonadiCheckJob::settingsCanBeImported() const
......
......@@ -37,7 +37,7 @@ public:
private:
inline Q_REQUIRED_RESULT bool resourceCanHaveSieveSupport(const QString &filename) const;
void loadSieveServerSettings();
Q_REQUIRED_RESULT bool importSettings(const QString &directory, const QString &filename);
void importSettings(const QString &directory, const QString &filename);
QMultiMap<QString, QString> mSieveServerLst;
};
......
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