[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Use private class
From: Montel Laurent <montel () kde ! org>
Date: 2015-08-31 19:39:04
Message-ID: E1ZWUv2-0005vM-78 () scm ! kde ! org
[Download RAW message or body]
Git commit b81173c29b1e15d9aca0cc24e2b062aa5498b99f by Montel Laurent.
Committed on 31/08/2015 at 19:38.
Pushed by mlaurent into branch 'master'.
Use private class
M +40 -25 libksieve/ksieveui/vacation/vacationmanager.cpp
M +2 -3 libksieve/ksieveui/vacation/vacationmanager.h
M +24 -5 libksieve/ksieveui/widgets/sievetreewidgetitem.cpp
M +2 -1 libksieve/ksieveui/widgets/sievetreewidgetitem.h
M +31 -11 messagecomposer/recipient/recipient.cpp
M +3 -4 messagecomposer/recipient/recipient.h
M +27 -12 messagecomposer/recipient/recipientseditor.cpp
M +2 -4 messagecomposer/recipient/recipientseditor.h
M +0 -3 messagecomposer/sender/akonadisender.h
http://commits.kde.org/kdepim/b81173c29b1e15d9aca0cc24e2b062aa5498b99f
diff --git a/libksieve/ksieveui/vacation/vacationmanager.cpp \
b/libksieve/ksieveui/vacation/vacationmanager.cpp index e65e540..35c2856 100644
--- a/libksieve/ksieveui/vacation/vacationmanager.cpp
+++ b/libksieve/ksieveui/vacation/vacationmanager.cpp
@@ -24,70 +24,85 @@
using namespace KSieveUi;
+class KSieveUi::VacationManagerPrivate
+{
+public:
+ VacationManagerPrivate(QWidget *parent)
+ : mWidget(parent)
+ {
+
+ }
+
+ QPointer<KSieveUi::MultiImapVacationDialog> mMultiImapVacationDialog;
+ QPointer<KSieveUi::MultiImapVacationManager> mCheckVacation;
+ QWidget *mWidget;
+};
+
VacationManager::VacationManager(QWidget *parent)
: QObject(parent),
- mWidget(parent)
+ d(new KSieveUi::VacationManagerPrivate(parent))
{
}
VacationManager::~VacationManager()
{
+ delete d;
}
void VacationManager::checkVacation()
{
- delete mCheckVacation;
+ delete d->mCheckVacation;
- mCheckVacation = new KSieveUi::MultiImapVacationManager(this);
- connect(mCheckVacation, SIGNAL(scriptActive(bool,QString)), \
SIGNAL(updateVacationScriptStatus(bool,QString)));
- connect(mCheckVacation, SIGNAL(requestEditVacation()), SIGNAL(editVacation()));
- mCheckVacation->checkVacation();
+ d->mCheckVacation = new KSieveUi::MultiImapVacationManager(this);
+ connect(d->mCheckVacation, SIGNAL(scriptActive(bool,QString)), \
SIGNAL(updateVacationScriptStatus(bool,QString))); + connect(d->mCheckVacation, \
SIGNAL(requestEditVacation()), SIGNAL(editVacation())); + \
d->mCheckVacation->checkVacation(); }
void VacationManager::slotEditVacation(const QString &serverName)
{
- if (mMultiImapVacationDialog) {
- mMultiImapVacationDialog->show();
- mMultiImapVacationDialog->raise();
- mMultiImapVacationDialog->activateWindow();
+ if (d->mMultiImapVacationDialog) {
+ d->mMultiImapVacationDialog->show();
+ d->mMultiImapVacationDialog->raise();
+ d->mMultiImapVacationDialog->activateWindow();
if (!serverName.isEmpty()) {
- mMultiImapVacationDialog->switchToServerNamePage(serverName);
+ d->mMultiImapVacationDialog->switchToServerNamePage(serverName);
}
return;
}
- mMultiImapVacationDialog = new KSieveUi::MultiImapVacationDialog(mWidget);
- connect(mMultiImapVacationDialog.data(), \
&KSieveUi::MultiImapVacationDialog::okClicked, this, \
&VacationManager::slotDialogOk);
- connect(mMultiImapVacationDialog.data(), \
&KSieveUi::MultiImapVacationDialog::cancelClicked, this, \
&VacationManager::slotDialogCanceled);
- mMultiImapVacationDialog->show();
+ d->mMultiImapVacationDialog = new KSieveUi::MultiImapVacationDialog(d->mWidget);
+ connect(d->mMultiImapVacationDialog.data(), \
&KSieveUi::MultiImapVacationDialog::okClicked, this, &VacationManager::slotDialogOk); \
+ connect(d->mMultiImapVacationDialog.data(), \
&KSieveUi::MultiImapVacationDialog::cancelClicked, this, \
&VacationManager::slotDialogCanceled); + d->mMultiImapVacationDialog->show();
if (!serverName.isEmpty()) {
- mMultiImapVacationDialog->switchToServerNamePage(serverName);
+ d->mMultiImapVacationDialog->switchToServerNamePage(serverName);
}
}
void VacationManager::slotDialogCanceled()
{
- if (mMultiImapVacationDialog->isVisible()) {
- mMultiImapVacationDialog->hide();
+ if (d->mMultiImapVacationDialog->isVisible()) {
+ d->mMultiImapVacationDialog->hide();
}
- mMultiImapVacationDialog->deleteLater();
- mMultiImapVacationDialog = Q_NULLPTR;
+ d->mMultiImapVacationDialog->deleteLater();
+ d->mMultiImapVacationDialog = Q_NULLPTR;
}
void VacationManager::slotDialogOk()
{
- QList<KSieveUi::VacationCreateScriptJob *> listJob = \
mMultiImapVacationDialog->listCreateJob(); + \
QList<KSieveUi::VacationCreateScriptJob *> listJob = \
d->mMultiImapVacationDialog->listCreateJob(); Q_FOREACH \
(KSieveUi::VacationCreateScriptJob *job, listJob) {
connect(job, SIGNAL(scriptActive(bool,QString)), \
SIGNAL(updateVacationScriptStatus(bool,QString))); job->start();
}
- if (mMultiImapVacationDialog->isVisible()) {
- mMultiImapVacationDialog->hide();
+ if (d->mMultiImapVacationDialog->isVisible()) {
+ d->mMultiImapVacationDialog->hide();
}
- mMultiImapVacationDialog->deleteLater();
+ d->mMultiImapVacationDialog->deleteLater();
- mMultiImapVacationDialog = Q_NULLPTR;
+ d->mMultiImapVacationDialog = Q_NULLPTR;
}
diff --git a/libksieve/ksieveui/vacation/vacationmanager.h \
b/libksieve/ksieveui/vacation/vacationmanager.h index e7d88fb..d58cee8 100644
--- a/libksieve/ksieveui/vacation/vacationmanager.h
+++ b/libksieve/ksieveui/vacation/vacationmanager.h
@@ -28,6 +28,7 @@ namespace KSieveUi
{
class MultiImapVacationManager;
class MultiImapVacationDialog;
+class VacationManagerPrivate;
class KSIEVEUI_EXPORT VacationManager : public QObject
{
Q_OBJECT
@@ -49,9 +50,7 @@ private Q_SLOTS:
void slotDialogOk();
private:
- QPointer<KSieveUi::MultiImapVacationDialog> mMultiImapVacationDialog;
- QPointer<KSieveUi::MultiImapVacationManager> mCheckVacation;
- QWidget *mWidget;
+ VacationManagerPrivate *const d;
};
}
diff --git a/libksieve/ksieveui/widgets/sievetreewidgetitem.cpp \
b/libksieve/ksieveui/widgets/sievetreewidgetitem.cpp index cd99e92..ceb6942 100644
--- a/libksieve/ksieveui/widgets/sievetreewidgetitem.cpp
+++ b/libksieve/ksieveui/widgets/sievetreewidgetitem.cpp
@@ -62,25 +62,44 @@ void SieveTreeWidgetProgress::stopAnimation()
mItem->setDefaultIcon();
}
+class KSieveUi::SieveTreeWidgetItemPrivate
+{
+public:
+ SieveTreeWidgetItemPrivate()
+ : mProgress(Q_NULLPTR)
+ {
+
+ }
+ ~SieveTreeWidgetItemPrivate()
+ {
+ delete mProgress;
+ }
+
+ SieveTreeWidgetProgress *mProgress;
+};
+
+
+
SieveTreeWidgetItem::SieveTreeWidgetItem(QTreeWidget *treeWidget, QTreeWidgetItem \
*item)
- : QTreeWidgetItem(treeWidget, item)
+ : QTreeWidgetItem(treeWidget, item),
+ d(new KSieveUi::SieveTreeWidgetItemPrivate)
{
- mProgress = new SieveTreeWidgetProgress(this);
+ d->mProgress = new SieveTreeWidgetProgress(this);
}
SieveTreeWidgetItem::~SieveTreeWidgetItem()
{
- delete mProgress;
+ delete d;
}
void SieveTreeWidgetItem::startAnimation()
{
- mProgress->startAnimation();
+ d->mProgress->startAnimation();
}
void SieveTreeWidgetItem::stopAnimation()
{
- mProgress->stopAnimation();
+ d->mProgress->stopAnimation();
}
void SieveTreeWidgetItem::setProgressAnimation(const QPixmap &pix)
diff --git a/libksieve/ksieveui/widgets/sievetreewidgetitem.h \
b/libksieve/ksieveui/widgets/sievetreewidgetitem.h index 810ee90..a8268cb 100644
--- a/libksieve/ksieveui/widgets/sievetreewidgetitem.h
+++ b/libksieve/ksieveui/widgets/sievetreewidgetitem.h
@@ -30,6 +30,7 @@ class QTreeWidgetItem;
namespace KSieveUi
{
class SieveTreeWidgetProgress;
+class SieveTreeWidgetItemPrivate;
class KSIEVEUI_EXPORT SieveTreeWidgetItem : public QTreeWidgetItem
{
public:
@@ -42,7 +43,7 @@ public:
void setProgressAnimation(const QPixmap &pix);
private:
- SieveTreeWidgetProgress *mProgress;
+ SieveTreeWidgetItemPrivate *const d;
};
class SieveTreeWidgetProgress : public QObject
diff --git a/messagecomposer/recipient/recipient.cpp \
b/messagecomposer/recipient/recipient.cpp index 54cd2bb..4548d1a 100644
--- a/messagecomposer/recipient/recipient.cpp
+++ b/messagecomposer/recipient/recipient.cpp
@@ -29,50 +29,70 @@
using namespace KPIM;
using namespace MessageComposer;
+class MessageComposer::RecipientPrivate
+{
+public:
+ RecipientPrivate(const QString &email, Recipient::Type type)
+ : mEmail(email),
+ mType(type)
+ {
+
+ }
+
+ QString mEmail;
+ QString mName;
+ MessageComposer::Recipient::Type mType;
+};
+
Recipient::Recipient(const QString &email, Recipient::Type type)
- : mEmail(email), mType(type)
+ : d(new MessageComposer::RecipientPrivate(email, type))
+{
+}
+
+Recipient::~Recipient()
{
+ delete d;
}
void Recipient::setType(Type type)
{
- mType = type;
+ d->mType = type;
}
Recipient::Type Recipient::type() const
{
- return mType;
+ return d->mType;
}
void Recipient::setEmail(const QString &email)
{
- mEmail = email;
+ d->mEmail = email;
}
QString Recipient::email() const
{
- return mEmail;
+ return d->mEmail;
}
void Recipient::setName(const QString &name)
{
- mName = name;
+ d->mName = name;
}
QString Recipient::name() const
{
- return mName;
+ return d->mName;
}
bool Recipient::isEmpty() const
{
- return mEmail.isEmpty();
+ return d->mEmail.isEmpty();
}
void Recipient::clear()
{
- mEmail.clear();
- mType = Recipient::To;
+ d->mEmail.clear();
+ d->mType = Recipient::To;
}
int Recipient::typeToId(Recipient::Type type)
@@ -87,7 +107,7 @@ Recipient::Type Recipient::idToType(int id)
QString Recipient::typeLabel() const
{
- return typeLabel(mType);
+ return typeLabel(d->mType);
}
QString Recipient::typeLabel(Recipient::Type type)
diff --git a/messagecomposer/recipient/recipient.h \
b/messagecomposer/recipient/recipient.h index dfed03b..7402a81 100644
--- a/messagecomposer/recipient/recipient.h
+++ b/messagecomposer/recipient/recipient.h
@@ -35,6 +35,7 @@ namespace MessageComposer
{
/** Represents a mail recipient. */
+class RecipientPrivate;
class MESSAGECOMPOSER_EXPORT Recipient : public KPIM::MultiplyingLineData
{
public:
@@ -44,7 +45,7 @@ public:
enum Type { To, Cc, Bcc, Undefined };
Recipient(const QString &email = QString(), Type type = To); \
//krazy:exclude=explicit
-
+ ~Recipient();
void setType(Type type);
Type type() const;
@@ -65,9 +66,7 @@ public:
static QStringList allTypeLabels();
private:
- QString mEmail;
- QString mName;
- Type mType;
+ RecipientPrivate *const d;
};
}
diff --git a/messagecomposer/recipient/recipientseditor.cpp \
b/messagecomposer/recipient/recipientseditor.cpp index e1fc3ff..2fefe5f 100644
--- a/messagecomposer/recipient/recipientseditor.cpp
+++ b/messagecomposer/recipient/recipientseditor.cpp
@@ -65,19 +65,33 @@ int RecipientLineFactory::maximumRecipients()
return MessageComposer::MessageComposerSettings::self()->maximumRecipients();
}
+class MessageComposer::RecipientsEditorPrivate
+{
+public:
+ RecipientsEditorPrivate()
+ : mRecentAddressConfig(Q_NULLPTR),
+ mSideWidget(Q_NULLPTR)
+ {
+
+ }
+ KConfig *mRecentAddressConfig;
+ RecipientsEditorSideWidget *mSideWidget;
+};
+
RecipientsEditor::RecipientsEditor(QWidget *parent)
- : MultiplyingLineEditor(new RecipientLineFactory(Q_NULLPTR), parent), \
mRecentAddressConfig(Q_NULLPTR) + : MultiplyingLineEditor(new \
RecipientLineFactory(Q_NULLPTR), parent), + d(new \
MessageComposer::RecipientsEditorPrivate) {
factory()->setParent(this); // HACK: can't use 'this' above since it's not yet \
constructed at that point
- mSideWidget = new RecipientsEditorSideWidget(this, this);
+ d->mSideWidget = new RecipientsEditorSideWidget(this, this);
- layout()->addWidget(mSideWidget);
+ layout()->addWidget(d->mSideWidget);
- connect(mSideWidget, &RecipientsEditorSideWidget::pickedRecipient, this, \
&RecipientsEditor::slotPickedRecipient);
- connect(mSideWidget, &RecipientsEditorSideWidget::saveDistributionList, this, \
&RecipientsEditor::saveDistributionList); + connect(d->mSideWidget, \
&RecipientsEditorSideWidget::pickedRecipient, this, \
&RecipientsEditor::slotPickedRecipient); + connect(d->mSideWidget, \
&RecipientsEditorSideWidget::saveDistributionList, this, \
&RecipientsEditor::saveDistributionList);
// connect( mView, SIGNAL(focusRight()),
- // mSideWidget, SLOT(setFocus()) );
+ // d->mSideWidget, SLOT(setFocus()) );
connect(this, &RecipientsEditor::lineAdded, this, \
&RecipientsEditor::slotLineAdded);
connect(this, &RecipientsEditor::lineDeleted, this, \
&RecipientsEditor::slotLineDeleted); @@ -87,6 +101,7 @@ \
RecipientsEditor::RecipientsEditor(QWidget *parent)
RecipientsEditor::~RecipientsEditor()
{
+ delete d;
}
bool RecipientsEditor::addRecipient(const QString &recipient, Recipient::Type type)
@@ -181,12 +196,12 @@ void RecipientsEditor::saveDistributionList()
void RecipientsEditor::selectRecipients()
{
- mSideWidget->pickRecipient();
+ d->mSideWidget->pickRecipient();
}
void MessageComposer::RecipientsEditor::setRecentAddressConfig(KConfig *config)
{
- mRecentAddressConfig = config;
+ d->mRecentAddressConfig = config;
if (config) {
MultiplyingLine *line;
foreach (line, lines()) {
@@ -207,7 +222,7 @@ void MessageComposer::RecipientsEditor::slotPickedRecipient(const \
Recipient &rec
RecipientsPicker *RecipientsEditor::picker() const
{
- return mSideWidget->picker();
+ return d->mSideWidget->picker();
}
void RecipientsEditor::slotLineAdded(MultiplyingLine *line)
@@ -220,8 +235,8 @@ void RecipientsEditor::slotLineAdded(MultiplyingLine *line)
return;
}
- if (mRecentAddressConfig) {
- rec->setRecentAddressConfig(mRecentAddressConfig);
+ if (d->mRecentAddressConfig) {
+ rec->setRecentAddressConfig(d->mRecentAddressConfig);
}
if (count > 0) {
@@ -294,7 +309,7 @@ void RecipientsEditor::slotCalculateTotal()
}
// update the side widget
- mSideWidget->setTotal(count, lines().count());
+ d->mSideWidget->setTotal(count, lines().count());
}
RecipientLineNG *RecipientsEditor::activeLine() const
diff --git a/messagecomposer/recipient/recipientseditor.h \
b/messagecomposer/recipient/recipientseditor.h index 62b0739..5507ab6 100644
--- a/messagecomposer/recipient/recipientseditor.h
+++ b/messagecomposer/recipient/recipientseditor.h
@@ -50,8 +50,7 @@ public:
};
class RecipientsPicker;
-class RecipientsEditorSideWidget;
-
+class RecipientsEditorPrivate;
class MESSAGECOMPOSER_EXPORT RecipientsEditor : public KPIM::MultiplyingLineEditor
{
Q_OBJECT
@@ -100,8 +99,7 @@ protected:
RecipientLineNG *activeLine() const Q_DECL_OVERRIDE;
private:
- KConfig *mRecentAddressConfig;
- RecipientsEditorSideWidget *mSideWidget;
+ RecipientsEditorPrivate *const d;
};
}
diff --git a/messagecomposer/sender/akonadisender.h \
b/messagecomposer/sender/akonadisender.h index 7bdf7a2..f04abc6 100644
--- a/messagecomposer/sender/akonadisender.h
+++ b/messagecomposer/sender/akonadisender.h
@@ -72,9 +72,6 @@ private Q_SLOTS:
private:
AkonadiSenderPrivate *const d;
- QSet<KJob *> mPendingJobs;
- int mCustomTransportId;
-
};
}
#endif /* AKONADISENDER_H */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic