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

Rename variable

parent 6bad7106
......@@ -120,7 +120,7 @@ void SieveEditorMainWidget::slotScriptRenamed(const QUrl &oldUrl, const QUrl &ne
updateStackedWidget();
}
void SieveEditorMainWidget::slotCreateScriptPage(const QUrl &url, const QStringList &capabilities, bool isNewScript, const KSieveUi::SieveImapAccountSettings &sieveAccount)
void SieveEditorMainWidget::slotCreateScriptPage(const QUrl &url, const QStringList &capabilities, bool isNewScript, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings)
{
QWidget *page = hasExistingPage(url);
if (page) {
......@@ -135,7 +135,7 @@ void SieveEditorMainWidget::slotCreateScriptPage(const QUrl &url, const QStringL
connect(editor, &SieveEditorPageWidget::copyAvailable, this, &SieveEditorMainWidget::copyAvailable);
connect(editor, &SieveEditorPageWidget::sieveEditorTabCurrentChanged, this, &SieveEditorMainWidget::sieveEditorTabCurrentChanged);
editor->setIsNewScript(isNewScript);
editor->loadScript(url, capabilities, sieveAccount);
editor->loadScript(url, capabilities, sieveImapAccountSettings);
mTabWidget->addTab(editor, url.fileName());
mTabWidget->setCurrentWidget(editor);
if (isNewScript) {
......
......@@ -101,7 +101,7 @@ Q_SIGNALS:
void sieveEditorTabCurrentChanged();
private Q_SLOTS:
void slotCreateScriptPage(const QUrl &url, const QStringList &capabilities, bool isNewScript, const KSieveUi::SieveImapAccountSettings &sieveAccount);
void slotCreateScriptPage(const QUrl &url, const QStringList &capabilities, bool isNewScript, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings);
void slotScriptDeleted(const QUrl &url);
void slotScriptRenamed(const QUrl &oldUrl, const QUrl &newUrl);
void slotScriptModified(bool modified, SieveEditorPageWidget *page);
......
......@@ -61,7 +61,7 @@ bool SieveEditorManageSieveWidget::refreshList()
last->setText(0, i18n("(Disabled) %1", last->text(0)));
} else {
KManageSieve::SieveJob *job = KManageSieve::SieveJob::list(u);
job->setProperty("sieveaccount", QVariant::fromValue(conf.account));
job->setProperty("sieveimapaccountsettings", QVariant::fromValue(conf.account));
connect(job, &KManageSieve::SieveJob::gotList, this, &SieveEditorManageSieveWidget::slotGotList);
mJobs.insert(job, last);
mUrls.insert(last, u);
......
......@@ -85,11 +85,11 @@ void SieveEditorPageWidget::setIsNewScript(bool isNewScript)
mIsNewScript = isNewScript;
}
void SieveEditorPageWidget::loadScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveAccount)
void SieveEditorPageWidget::loadScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings)
{
mCurrentURL = url;
mSieveEditorWidget->setSieveCapabilities(capabilities);
mSieveEditorWidget->setSieveImapAccountSettings(sieveAccount);
mSieveEditorWidget->setSieveImapAccountSettings(sieveImapAccountSettings);
mSieveEditorWidget->setReadOnly(true);
mSieveEditorWidget->wordWrap(SieveEditorGlobalConfig::self()->wrapText());
KManageSieve::SieveJob *job = KManageSieve::SieveJob::get(url);
......
......@@ -38,7 +38,7 @@ public:
explicit SieveEditorPageWidget(QWidget *parent = Q_NULLPTR);
~SieveEditorPageWidget();
void loadScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveAccount);
void loadScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings);
QUrl currentUrl() const;
void setCurrentUrl(const QUrl &url);
void setIsNewScript(bool isNewScript);
......
......@@ -54,14 +54,14 @@ void SieveEditorScriptManagerWidget::slotUpdateButtons(QTreeWidgetItem *item)
Q_EMIT updateButtons(newScriptAction, editScriptAction, deleteScriptAction, desactivateScriptAction);
}
void SieveEditorScriptManagerWidget::slotEditScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveAccount)
void SieveEditorScriptManagerWidget::slotEditScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings)
{
Q_EMIT createScriptPage(url, capabilities, false, sieveAccount);
Q_EMIT createScriptPage(url, capabilities, false, sieveImapAccountSettings);
}
void SieveEditorScriptManagerWidget::slotNewScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveAccount)
void SieveEditorScriptManagerWidget::slotNewScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings)
{
Q_EMIT createScriptPage(url, capabilities, true, sieveAccount);
Q_EMIT createScriptPage(url, capabilities, true, sieveImapAccountSettings);
}
void SieveEditorScriptManagerWidget::slotCreateNewScript()
......
......@@ -42,7 +42,7 @@ public:
void refreshList();
Q_SIGNALS:
void createScriptPage(const QUrl &url, const QStringList &capabilities, bool isNewScript, const KSieveUi::SieveImapAccountSettings &sieveAccount);
void createScriptPage(const QUrl &url, const QStringList &capabilities, bool isNewScript, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings);
void updateButtons(bool newScriptAction, bool editScriptAction, bool deleteScriptAction, bool desactivateScriptAction);
void scriptDeleted(const QUrl &url);
void serverSieveFound(bool hasServerSieve);
......@@ -54,8 +54,8 @@ public Q_SLOTS:
void slotRefreshList();
private Q_SLOTS:
void slotNewScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveAccount);
void slotEditScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveAccount);
void slotNewScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings);
void slotEditScript(const QUrl &url, const QStringList &capabilities, const KSieveUi::SieveImapAccountSettings &sieveImapAccountSettings);
void slotUpdateButtons(QTreeWidgetItem *item);
private:
......
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