summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <[email protected]>2018-12-11 09:06:31 +0100
committerLaurent Montel <[email protected]>2018-12-11 09:06:31 +0100
commit60abae2adcff31e427b50347ae8af7ab7075a9ba (patch)
tree7d05173315a2618ed9bb9d6bbe0231bc126312c6
parent09484467ef9256392498e0c5d3edbc84d4364a83 (diff)
Clean up
-rw-r--r--src/folder/favoritecollectionorderproxymodel.cpp10
-rw-r--r--src/folder/favoritecollectionorderproxymodel.h3
-rw-r--r--src/folder/foldercollectionmonitor.cpp1
-rw-r--r--src/folder/folderrequester.cpp4
-rw-r--r--src/folder/folderselectiondialog.cpp7
-rw-r--r--src/folder/foldertreeview.cpp4
-rw-r--r--src/folder/foldertreewidget.cpp9
7 files changed, 1 insertions, 37 deletions
diff --git a/src/folder/favoritecollectionorderproxymodel.cpp b/src/folder/favoritecollectionorderproxymodel.cpp
index 11fedfd..f001a1a 100644
--- a/src/folder/favoritecollectionorderproxymodel.cpp
+++ b/src/folder/favoritecollectionorderproxymodel.cpp
@@ -24,23 +24,13 @@
using namespace MailCommon;
-class Q_DECL_HIDDEN FavoriteCollectionOrderProxyModel::FavoriteCollectionOrderProxyModelPrivate
-{
-public:
- FavoriteCollectionOrderProxyModelPrivate()
- {
- }
-};
-
FavoriteCollectionOrderProxyModel::FavoriteCollectionOrderProxyModel(QObject *parent)
: EntityOrderProxyModel(parent)
- , d(nullptr) //, d(new FavoriteCollectionOrderProxyModelPrivate())
{
}
FavoriteCollectionOrderProxyModel::~FavoriteCollectionOrderProxyModel()
{
- delete d;
}
Akonadi::Collection FavoriteCollectionOrderProxyModel::parentCollection(const QModelIndex &index) const
diff --git a/src/folder/favoritecollectionorderproxymodel.h b/src/folder/favoritecollectionorderproxymodel.h
index 20e4c50..cb9b457 100644
--- a/src/folder/favoritecollectionorderproxymodel.h
+++ b/src/folder/favoritecollectionorderproxymodel.h
@@ -37,9 +37,6 @@ public:
protected:
Akonadi::Collection parentCollection(const QModelIndex &index) const override;
-private:
- class FavoriteCollectionOrderProxyModelPrivate;
- FavoriteCollectionOrderProxyModelPrivate *const d;
};
}
diff --git a/src/folder/foldercollectionmonitor.cpp b/src/folder/foldercollectionmonitor.cpp
index be649f8..4551e77 100644
--- a/src/folder/foldercollectionmonitor.cpp
+++ b/src/folder/foldercollectionmonitor.cpp
@@ -40,7 +40,6 @@ class MailCommon::FolderCollectionMonitorPrivate
{
public:
FolderCollectionMonitorPrivate()
- : mMonitor(nullptr)
{
}
diff --git a/src/folder/folderrequester.cpp b/src/folder/folderrequester.cpp
index ef196dc..298adec 100644
--- a/src/folder/folderrequester.cpp
+++ b/src/folder/folderrequester.cpp
@@ -48,10 +48,6 @@ class FolderRequesterPrivate
{
public:
FolderRequesterPrivate()
- : mEdit(nullptr)
- , mMustBeReadWrite(true)
- , mShowOutbox(true)
- , mNotCreateNewFolder(false)
{
}
diff --git a/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp
index b94900b..cf26ee1 100644
--- a/src/folder/folderselectiondialog.cpp
+++ b/src/folder/folderselectiondialog.cpp
@@ -46,11 +46,6 @@ class Q_DECL_HIDDEN FolderSelectionDialog::FolderSelectionDialogPrivate
{
public:
FolderSelectionDialogPrivate()
- : folderTreeWidget(nullptr)
- , mUser1Button(nullptr)
- , mOkButton(nullptr)
- , mNotAllowToCreateNewFolder(false)
- , mUseGlobalSettings(true)
{
}
@@ -58,7 +53,7 @@ public:
QPushButton *mUser1Button = nullptr;
QPushButton *mOkButton = nullptr;
bool mNotAllowToCreateNewFolder = false;
- bool mUseGlobalSettings = false;
+ bool mUseGlobalSettings = true;
};
FolderSelectionDialog::FolderSelectionDialog(QWidget *parent, SelectionFolderOptions options)
diff --git a/src/folder/foldertreeview.cpp b/src/folder/foldertreeview.cpp
index 4478dbd..491b0bf 100644
--- a/src/folder/foldertreeview.cpp
+++ b/src/folder/foldertreeview.cpp
@@ -38,16 +38,12 @@ using namespace MailCommon;
FolderTreeView::FolderTreeView(QWidget *parent, bool showUnreadCount)
: Akonadi::EntityTreeView(parent)
- , mbDisableContextMenuAndExtraColumn(false)
- , mbDisableSaveConfig(false)
{
init(showUnreadCount);
}
FolderTreeView::FolderTreeView(KXMLGUIClient *xmlGuiClient, QWidget *parent, bool showUnreadCount)
: Akonadi::EntityTreeView(xmlGuiClient, parent)
- , mbDisableContextMenuAndExtraColumn(false)
- , mbDisableSaveConfig(false)
{
init(showUnreadCount);
}
diff --git a/src/folder/foldertreewidget.cpp b/src/folder/foldertreewidget.cpp
index 1395636..51fa2ae 100644
--- a/src/folder/foldertreewidget.cpp
+++ b/src/folder/foldertreewidget.cpp
@@ -57,15 +57,6 @@ class Q_DECL_HIDDEN FolderTreeWidget::FolderTreeWidgetPrivate
{
public:
FolderTreeWidgetPrivate()
- : filterModel(nullptr)
- , folderTreeView(nullptr)
- , quotaModel(nullptr)
- , readableproxy(nullptr)
- , entityOrderProxy(nullptr)
- , filterFolderLineEdit(nullptr)
- , saver(nullptr)
- , label(nullptr)
- , dontKeyFilter(false)
{
}