summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-20 08:57:45 +0200
committerMontel Laurent <[email protected]>2017-09-20 08:57:45 +0200
commit6df9ac72548563e0d256c0fde172dd193e321738 (patch)
tree577ee1dff70635582e6f2e9f6b2217ba785c865b
parentdfd8c589c53e8f91da00ac1b92d3e6adae62c8a9 (diff)
Clean up
-rw-r--r--src/configuredialog/configuredialog_p.cpp1
-rw-r--r--src/configuredialog/configuredialog_p.h2
-rw-r--r--src/configuredialog/configuredialoglistview.h4
-rw-r--r--src/configuredialog/configureplugins/configurepluginslistwidget.h4
-rw-r--r--src/dialog/addemailtoexistingcontactdialog.h3
-rw-r--r--src/dialog/archivefolderdialog.h3
-rw-r--r--src/dialog/kmknotify.h5
-rw-r--r--src/editor/attachment/attachmentview.h4
-rw-r--r--src/editor/potentialphishingemail/potentialphishingdetaildialog.h4
-rw-r--r--src/editor/potentialphishingemail/potentialphishingemailwarning.h3
-rw-r--r--src/editor/validatesendmailshortcut.h4
-rw-r--r--src/tag/tagselectdialog.h4
-rw-r--r--src/warningwidgets/attachmentmissingwarning.h7
13 files changed, 16 insertions, 32 deletions
diff --git a/src/configuredialog/configuredialog_p.cpp b/src/configuredialog/configuredialog_p.cpp
index ff61f5c..7df44ef 100644
--- a/src/configuredialog/configuredialog_p.cpp
+++ b/src/configuredialog/configuredialog_p.cpp
@@ -18,7 +18,6 @@
ConfigModuleWithTabs::ConfigModuleWithTabs(QWidget *parent)
: ConfigModule(parent)
- , mWasInitialized(false)
{
QVBoxLayout *vlay = new QVBoxLayout(this);
vlay->setMargin(0);
diff --git a/src/configuredialog/configuredialog_p.h b/src/configuredialog/configuredialog_p.h
index c46d41d..c857576 100644
--- a/src/configuredialog/configuredialog_p.h
+++ b/src/configuredialog/configuredialog_p.h
@@ -82,7 +82,7 @@ protected:
private:
QTabWidget *mTabWidget = nullptr;
- bool mWasInitialized;
+ bool mWasInitialized = false;
};
#endif // _CONFIGURE_DIALOG_PRIVATE_H_
diff --git a/src/configuredialog/configuredialoglistview.h b/src/configuredialog/configuredialoglistview.h
index c45c172..c0720a9 100644
--- a/src/configuredialog/configuredialoglistview.h
+++ b/src/configuredialog/configuredialoglistview.h
@@ -20,10 +20,8 @@ protected:
void resizeEvent(QResizeEvent *e) override;
void showEvent(QShowEvent *e) override;
-private Q_SLOTS:
- void slotContextMenu(const QPoint &pos);
-
private:
+ void slotContextMenu(const QPoint &pos);
void resizeColums();
};
diff --git a/src/configuredialog/configureplugins/configurepluginslistwidget.h b/src/configuredialog/configureplugins/configurepluginslistwidget.h
index 55b49f0..5f41ccd 100644
--- a/src/configuredialog/configureplugins/configurepluginslistwidget.h
+++ b/src/configuredialog/configureplugins/configurepluginslistwidget.h
@@ -34,10 +34,8 @@ public:
void initialize() override;
void defaults() override;
-private Q_SLOTS:
- void slotConfigureClicked(const QString &configureGroupName, const QString &identifier);
-
private:
+ void slotConfigureClicked(const QString &configureGroupName, const QString &identifier);
void initializeAgentPlugins();
PimCommon::PluginUtilData createAgentPluginData(const QString &interfaceName, const QString &path);
bool agentActivateState(const QString &interfaceName, const QString &pathName, bool &failed);
diff --git a/src/dialog/addemailtoexistingcontactdialog.h b/src/dialog/addemailtoexistingcontactdialog.h
index 8d5410b..5d2116c 100644
--- a/src/dialog/addemailtoexistingcontactdialog.h
+++ b/src/dialog/addemailtoexistingcontactdialog.h
@@ -33,11 +33,10 @@ public:
Akonadi::Item selectedContact() const;
-private Q_SLOTS:
+private:
void slotSelectionChanged();
void slotDoubleClicked();
-private:
void readConfig();
void writeConfig();
Akonadi::EmailAddressSelectionWidget *mEmailSelectionWidget = nullptr;
diff --git a/src/dialog/archivefolderdialog.h b/src/dialog/archivefolderdialog.h
index 5500d0f..15613e7 100644
--- a/src/dialog/archivefolderdialog.h
+++ b/src/dialog/archivefolderdialog.h
@@ -42,14 +42,13 @@ public:
explicit ArchiveFolderDialog(QWidget *parent = nullptr);
void setFolder(const Akonadi::Collection &defaultCollection);
-private Q_SLOTS:
+private:
void slotFixFileExtension();
void slotFolderChanged(const Akonadi::Collection &);
void slotRecursiveCheckboxClicked();
void slotAccepted();
void slotUrlChanged(const QString &);
-private:
bool allowToDeleteFolders(const Akonadi::Collection &folder) const;
QString standardArchivePath(const QString &folderName);
diff --git a/src/dialog/kmknotify.h b/src/dialog/kmknotify.h
index 504c914..34bc5bb 100644
--- a/src/dialog/kmknotify.h
+++ b/src/dialog/kmknotify.h
@@ -34,17 +34,14 @@ public:
void setCurrentNotification(const QString &name);
-private Q_SLOTS:
+private:
void slotComboChanged(int);
void slotOk();
void slotConfigChanged(bool changed);
-private:
void initCombobox();
void writeConfig();
void readConfig();
-
-private:
KComboBox *m_comboNotify = nullptr;
KNotifyConfigWidget *m_notifyWidget = nullptr;
bool m_changed = false;
diff --git a/src/editor/attachment/attachmentview.h b/src/editor/attachment/attachmentview.h
index 8dfa5e7..1f3d4da 100644
--- a/src/editor/attachment/attachmentview.h
+++ b/src/editor/attachment/attachmentview.h
@@ -63,10 +63,8 @@ protected:
/** reimpl to avoid drags from ourselves */
void dragEnterEvent(QDragEnterEvent *event) override;
-private Q_SLOTS:
- void slotShowHideAttchementList(bool);
-
private:
+ void slotShowHideAttchementList(bool);
void saveHeaderState();
void restoreHeaderState();
diff --git a/src/editor/potentialphishingemail/potentialphishingdetaildialog.h b/src/editor/potentialphishingemail/potentialphishingdetaildialog.h
index 12457a5..eecf419 100644
--- a/src/editor/potentialphishingemail/potentialphishingdetaildialog.h
+++ b/src/editor/potentialphishingemail/potentialphishingdetaildialog.h
@@ -32,10 +32,8 @@ public:
void fillList(const QStringList &lst);
-private Q_SLOTS:
- void slotSave();
-
private:
+ void slotSave();
void readConfig();
void writeConfig();
PotentialPhishingDetailWidget *mPotentialPhishingDetailWidget = nullptr;
diff --git a/src/editor/potentialphishingemail/potentialphishingemailwarning.h b/src/editor/potentialphishingemail/potentialphishingemailwarning.h
index 1e504fe..098a53e 100644
--- a/src/editor/potentialphishingemail/potentialphishingemailwarning.h
+++ b/src/editor/potentialphishingemail/potentialphishingemailwarning.h
@@ -35,9 +35,8 @@ public:
Q_SIGNALS:
void sendNow();
-private Q_SLOTS:
- void slotShowDetails(const QString &link);
private:
+ void slotShowDetails(const QString &link);
QStringList mPotentialPhishingEmails;
};
diff --git a/src/editor/validatesendmailshortcut.h b/src/editor/validatesendmailshortcut.h
index 28af5fa..759979c 100644
--- a/src/editor/validatesendmailshortcut.h
+++ b/src/editor/validatesendmailshortcut.h
@@ -29,8 +29,8 @@ public:
bool validate();
private:
- QWidget *mParent;
- KActionCollection *mActionCollection;
+ QWidget *mParent = nullptr;
+ KActionCollection *mActionCollection = nullptr;
};
#endif // VALIDATESENDMAILSHORTCUT_H
diff --git a/src/tag/tagselectdialog.h b/src/tag/tagselectdialog.h
index 26a51c3..1cc7b6e 100644
--- a/src/tag/tagselectdialog.h
+++ b/src/tag/tagselectdialog.h
@@ -37,11 +37,9 @@ public:
void setActionCollection(const QList<KActionCollection *> &actionCollectionList);
-private Q_SLOTS:
+private:
void slotAddNewTag();
void slotTagsFetched(KJob *);
-
-private:
void writeConfig();
void readConfig();
void createTagList(bool updateList);
diff --git a/src/warningwidgets/attachmentmissingwarning.h b/src/warningwidgets/attachmentmissingwarning.h
index e9032b0..f41231e 100644
--- a/src/warningwidgets/attachmentmissingwarning.h
+++ b/src/warningwidgets/attachmentmissingwarning.h
@@ -29,9 +29,6 @@ public:
explicit AttachmentMissingWarning(QWidget *parent = nullptr);
~AttachmentMissingWarning();
-private Q_SLOTS:
- void explicitlyClosed();
- void slotAttachFile();
public Q_SLOTS:
void slotFileAttached();
@@ -40,6 +37,10 @@ Q_SIGNALS:
void attachMissingFile();
void closeAttachMissingFile();
void explicitClosedMissingAttachment();
+
+private:
+ void explicitlyClosed();
+ void slotAttachFile();
};
#endif // ATTACHMENTMISSINGWARNING_H