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

Clean up

parent 444d4844
......@@ -315,10 +315,6 @@ private Q_SLOTS:
void slotUpdateToolbars();
void slotEditKeys();
/**
* Read settings from app's config file.
*/
void readConfig(bool reload = false);
/**
* Change window title to given string.
......@@ -415,6 +411,11 @@ public: // kmcommand
QList<KToggleAction *> customToolsList() const;
QList<QAction *> pluginToolsActionListForPopupMenu() const;
private:
/**
* Read settings from app's config file.
*/
void readConfig(bool reload = false);
QUrl insertFile();
/**
* Updates the visibility and text of the signature and encryption state indicators.
......
......@@ -88,13 +88,10 @@ public:
void updateIdentity(KIdentityManagement::Identity &ident);
protected Q_SLOTS:
private:
void slotAboutToShow(int);
// copy default templates to identity templates
void slotCopyGlobal();
private:
void slotAccepted();
void slotDelayedButtonClicked(KJob *);
void slotEditVcard();
......
......@@ -62,9 +62,9 @@ IdentityPage::IdentityPage(QWidget *parent)
mIPage.mIdentityList->setIdentityManager(mIdentityManager);
connect(mIPage.mIdentityList, &QTreeWidget::itemSelectionChanged, this, &IdentityPage::slotIdentitySelectionChanged);
connect(this, SIGNAL(changed(bool)),
SLOT(slotIdentitySelectionChanged()));
connect(mIPage.mIdentityList, SIGNAL(rename(KMail::IdentityListViewItem*,QString)), SLOT(slotRenameIdentityFromItem(KMail::IdentityListViewItem*,QString)));
connect(this, QOverload<bool>::of(&IdentityPage::changed), this, &IdentityPage::slotIdentitySelectionChanged);
connect(mIPage.mIdentityList, QOverload<KMail::IdentityListViewItem*, const QString&>::of(&IdentityListView::rename),
this, &IdentityPage::slotRenameIdentityFromItem);
connect(mIPage.mIdentityList, &QTreeWidget::itemDoubleClicked, this, &IdentityPage::slotModifyIdentity);
connect(mIPage.mIdentityList, &IdentityListView::contextMenu, this, &IdentityPage::slotContextMenu);
// ### connect dragged(...), ...
......
......@@ -49,7 +49,7 @@ public:
void load() override;
void save() override;
private Q_SLOTS:
private:
void slotNewIdentity();
void slotModifyIdentity();
void slotRemoveIdentity();
......@@ -63,7 +63,6 @@ private Q_SLOTS:
void slotSetAsDefault();
void slotIdentitySelectionChanged();
private: // methods
void refreshList();
void updateButtons();
......
......@@ -28,10 +28,6 @@
struct CreateForwardMessageJobSettings
{
CreateForwardMessageJobSettings()
{
}
QUrl mUrl;
Akonadi::Item mItem;
KMime::Message::Ptr mMsg;
......
......@@ -234,7 +234,7 @@ private Q_SLOTS:
void slotDeleteItem(KJob *job);
private:
Result execute() override;
bool mDeleteFromSource;
bool mDeleteFromSource = false;
};
class KMEditMessageCommand : public KMCommand
......@@ -327,7 +327,7 @@ private:
QString mSelection;
QString mTemplate;
MessageComposer::ReplyStrategy m_replyStrategy;
bool mNoQuote;
bool mNoQuote = false;
};
class KMForwardCommand : public KMCommand
......@@ -396,9 +396,9 @@ private:
QFont mOverrideFont;
QString mEncoding;
MessageViewer::Viewer::DisplayFormatMessage mFormat;
bool mHtmlLoadExtOverride;
bool mUseFixedFont;
bool mPrintPreview;
bool mHtmlLoadExtOverride = false;
bool mUseFixedFont = false;
bool mPrintPreview = false;
};
class KMSetStatusCommand : public KMCommand
......@@ -415,7 +415,7 @@ protected Q_SLOTS:
private:
Result execute() override;
MessageStatus mStatus;
bool mInvertMark;
bool mInvertMark = false;
};
/** This command is used to set or toggle a tag for a list of messages. If toggle is
......
......@@ -498,7 +498,7 @@ void KMKernel::setSystrayIconNotificationsEnabled(bool enabled)
}
}
QStringList KMKernel::accounts()
QStringList KMKernel::accounts() const
{
QStringList accountLst;
const Akonadi::AgentInstance::List lst = MailCommon::Util::agentInstances();
......@@ -1277,6 +1277,11 @@ KIdentityManagement::IdentityManager *KMKernel::identityManager()
return KIdentityManagement::IdentityManager::self();
}
JobScheduler *KMKernel::jobScheduler() const
{
return mJobScheduler;
}
KMainWindow *KMKernel::mainWin()
{
// First look for a KMMainWin.
......
......@@ -152,7 +152,7 @@ public Q_SLOTS:
*/
Q_SCRIPTABLE void resumeNetworkJobs();
Q_SCRIPTABLE QStringList accounts();
Q_SCRIPTABLE QStringList accounts() const;
Q_SCRIPTABLE void makeResourceOnline(MessageViewer::Viewer::ResourceOnlineMode mode);
......@@ -348,10 +348,7 @@ public:
/** return the pointer to the identity manager */
KIdentityManagement::IdentityManager *identityManager() override;
MailCommon::JobScheduler *jobScheduler() const override
{
return mJobScheduler;
}
MailCommon::JobScheduler *jobScheduler() const override;
/** Expire all folders, used for the gui action */
void expireAllFoldersNow();
......@@ -506,11 +503,11 @@ private:
the user has just updated. read from config */
QString the_previousVersion;
/** is this the first start? read from config */
bool the_firstStart;
bool the_firstStart = false;
/** are we going down? set from here */
bool the_shuttingDown;
bool the_shuttingDown = false;
/** true unles kmail is closed by session management */
bool the_firstInstance;
bool the_firstInstance = false;
KSharedConfig::Ptr mConfig;
QTextCodec *mNetCodec = nullptr;
......
......@@ -173,12 +173,12 @@ public:
QList<QAction *> interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const;
void setPrintElementBackground(bool printElementBackground);
/** Force update even if message is the same */
void clearCache();
Q_SIGNALS:
void showStatusBarMessage(const QString &message);
public Q_SLOTS:
/** Force update even if message is the same */
void clearCache();
/** The user selected "Find" from the menu. */
void slotFind();
......
......@@ -100,7 +100,7 @@ Q_SIGNALS:
*/
void tagMoreActionClicked();
private Q_SLOTS:
private:
void finishedTagListing(KJob *job);
void newTagActionClicked();
void onSignalMapped(const QString &tag);
......@@ -108,7 +108,6 @@ private Q_SLOTS:
void onTagRemoved(const Akonadi::Tag &);
void onTagChanged(const Akonadi::Tag &);
private:
void fillTagList();
void createTagAction(const MailCommon::Tag::Ptr &tag, bool addToMenu);
void createTagActions(const QList<MailCommon::Tag::Ptr> &);
......
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