Commit 7e2c04d3 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: use nullptr now

parent 9d6347bf
......@@ -58,7 +58,7 @@ void DummyKernel::syncConfig()
MailCommon::JobScheduler *DummyKernel::jobScheduler() const
{
Q_ASSERT(false);
return Q_NULLPTR;
return nullptr;
}
Akonadi::ChangeRecorder *DummyKernel::folderCollectionMonitor() const
......
......@@ -17,7 +17,7 @@ class FolderCollectionMonitor;
class DummyKernel : public QObject, public MailCommon::IKernel, public MailCommon::ISettings
{
public:
explicit DummyKernel(QObject *parent = Q_NULLPTR);
explicit DummyKernel(QObject *parent = nullptr);
KIdentityManagement::IdentityManager *identityManager() Q_DECL_OVERRIDE;
MessageComposer::MessageSender *msgSender() Q_DECL_OVERRIDE;
......
......@@ -66,11 +66,11 @@ private Q_SLOTS:
{
AkonadiTest::checkTestIsIsolated();
DummyKernel *kernel = new DummyKernel(Q_NULLPTR);
DummyKernel *kernel = new DummyKernel(nullptr);
CommonKernel->registerKernelIf(kernel);
CommonKernel->registerSettingsIf(kernel);
mFolderTreeWidget = new MailCommon::FolderTreeWidget(Q_NULLPTR);
mFolderTreeWidget = new MailCommon::FolderTreeWidget(nullptr);
const QStringList resourceOrder{"akonadi_knut_resource_2", "akonadi_knut_resource_0"}; // _1 isn't specified so it goes at the end
mFolderTreeWidget->entityOrderProxy()->setTopLevelOrder(resourceOrder);
......
......@@ -24,7 +24,7 @@ class CollectionAnnotationsAttributeTest : public QObject
{
Q_OBJECT
public:
explicit CollectionAnnotationsAttributeTest(QObject *parent = Q_NULLPTR);
explicit CollectionAnnotationsAttributeTest(QObject *parent = nullptr);
~CollectionAnnotationsAttributeTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -27,7 +27,7 @@ class ContentTypeWidgetTest : public QObject
{
Q_OBJECT
public:
explicit ContentTypeWidgetTest(QObject *parent = Q_NULLPTR);
explicit ContentTypeWidgetTest(QObject *parent = nullptr);
~ContentTypeWidgetTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -24,7 +24,7 @@ class ExpireCollectionAttributeTest : public QObject
{
Q_OBJECT
public:
explicit ExpireCollectionAttributeTest(QObject *parent = Q_NULLPTR);
explicit ExpireCollectionAttributeTest(QObject *parent = nullptr);
~ExpireCollectionAttributeTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -26,7 +26,7 @@ class IncidencesForWidgetTest : public QObject
{
Q_OBJECT
public:
explicit IncidencesForWidgetTest(QObject *parent = Q_NULLPTR);
explicit IncidencesForWidgetTest(QObject *parent = nullptr);
~IncidencesForWidgetTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -192,7 +192,7 @@ void CollectionExpiryPage::saveAndExpire(Akonadi::Collection &collection, bool s
expireNow = false; // settings are not valid
}
MailCommon::ExpireCollectionAttribute *attribute = Q_NULLPTR;
MailCommon::ExpireCollectionAttribute *attribute = nullptr;
if (expireToFolder.isValid() && moveToRB->isChecked()) {
if (expireToFolder.id() == collection.id()) {
KMessageBox::error(this, i18n("Please select a different folder than the current folder to expire messages into.\nIf this is not done, expired messages will be permanently deleted."),
......
......@@ -52,11 +52,11 @@ using namespace MailCommon;
CollectionGeneralPage::CollectionGeneralPage(QWidget *parent)
: CollectionPropertiesPage(parent),
mContentsComboBox(Q_NULLPTR),
mIncidencesForComboBox(Q_NULLPTR),
mSharedSeenFlagsCheckBox(Q_NULLPTR),
mNameEdit(Q_NULLPTR),
mFolderCollection(Q_NULLPTR)
mContentsComboBox(nullptr),
mIncidencesForComboBox(nullptr),
mSharedSeenFlagsCheckBox(nullptr),
mNameEdit(nullptr),
mFolderCollection(nullptr)
{
setObjectName(QStringLiteral("MailCommon::CollectionGeneralPage"));
setPageTitle(i18nc("@title:tab General settings for a folder.", "General"));
......
......@@ -31,7 +31,7 @@ class MailCommon::ContentTypeWidgetPrivate
{
public:
ContentTypeWidgetPrivate()
: mContentsComboBox(Q_NULLPTR)
: mContentsComboBox(nullptr)
{
}
......
......@@ -29,7 +29,7 @@ class MailCommon::IncidencesForWidgetPrivate
{
public:
IncidencesForWidgetPrivate()
: mIncidencesForComboBox(Q_NULLPTR)
: mIncidencesForComboBox(nullptr)
{
}
......
......@@ -38,7 +38,7 @@ FilterActionAddHeaderTest::~FilterActionAddHeaderTest()
void FilterActionAddHeaderTest::shouldCreateWidget()
{
MailCommon::FilterActionAddHeader filter;
QWidget *widget = filter.createParamWidget(Q_NULLPTR);
QWidget *widget = filter.createParamWidget(nullptr);
QVERIFY(widget);
PimCommon::MinimumComboBox *comboBox = widget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
QVERIFY(comboBox);
......@@ -63,7 +63,7 @@ void FilterActionAddHeaderTest::shouldAddValue_data()
void FilterActionAddHeaderTest::shouldClearWidget()
{
MailCommon::FilterActionAddHeader filter;
QWidget *widget = filter.createParamWidget(Q_NULLPTR);
QWidget *widget = filter.createParamWidget(nullptr);
PimCommon::MinimumComboBox *comboBox = widget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
KLineEdit *lineEdit = widget->findChild<KLineEdit *>(QStringLiteral("ledit"));
comboBox->lineEdit()->setText(QStringLiteral("test"));
......@@ -197,7 +197,7 @@ void FilterActionAddHeaderTest::shouldAddValue()
QFETCH(QString, resultvalue);
MailCommon::FilterActionAddHeader filter;
QWidget *widget = filter.createParamWidget(Q_NULLPTR);
QWidget *widget = filter.createParamWidget(nullptr);
filter.argsFromString(argsinput);
filter.setParamWidgetValue(widget);
PimCommon::MinimumComboBox *comboBox = widget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
......
......@@ -24,7 +24,7 @@ class FilterActionAddHeaderTest : public QObject
{
Q_OBJECT
public:
explicit FilterActionAddHeaderTest(QObject *parent = Q_NULLPTR);
explicit FilterActionAddHeaderTest(QObject *parent = nullptr);
~FilterActionAddHeaderTest();
private Q_SLOTS:
void shouldCreateWidget();
......
......@@ -39,7 +39,7 @@ FilterActionAddToAddressBookTest::~FilterActionAddToAddressBookTest()
void FilterActionAddToAddressBookTest::shouldHaveDefaultValue()
{
MailCommon::FilterActionAddToAddressBook filter;
QWidget *w = filter.createParamWidget(Q_NULLPTR);
QWidget *w = filter.createParamWidget(nullptr);
PimCommon::MinimumComboBox *headerCombo = w->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("HeaderComboBox"));
QVERIFY(headerCombo);
......
......@@ -24,7 +24,7 @@ class FilterActionAddToAddressBookTest : public QObject
{
Q_OBJECT
public:
explicit FilterActionAddToAddressBookTest(QObject *parent = Q_NULLPTR);
explicit FilterActionAddToAddressBookTest(QObject *parent = nullptr);
~FilterActionAddToAddressBookTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
......@@ -24,7 +24,7 @@ class FilterActionCopyTest : public QObject
{
Q_OBJECT
public:
explicit FilterActionCopyTest(QObject *parent = Q_NULLPTR);
explicit FilterActionCopyTest(QObject *parent = nullptr);
~FilterActionCopyTest();
private Q_SLOTS:
void shouldBeEmpty();
......
......@@ -32,8 +32,8 @@ FilterActionDeleteTest::~FilterActionDeleteTest()
void FilterActionDeleteTest::shouldHaveDefaultValue()
{
MailCommon::FilterActionDelete filter(Q_NULLPTR);
QWidget *w = filter.createParamWidget(Q_NULLPTR);
MailCommon::FilterActionDelete filter(nullptr);
QWidget *w = filter.createParamWidget(nullptr);
QVERIFY(w);
QLabel *lab = dynamic_cast<QLabel *>(w);
......@@ -43,7 +43,7 @@ void FilterActionDeleteTest::shouldHaveDefaultValue()
void FilterActionDeleteTest::shouldReturnSieveValue()
{
MailCommon::FilterActionDelete filter(Q_NULLPTR);
MailCommon::FilterActionDelete filter(nullptr);
QCOMPARE(filter.sieveCode(), QStringLiteral("discard;"));
}
......
......@@ -24,7 +24,7 @@ class FilterActionDeleteTest : public QObject
{
Q_OBJECT
public:
explicit FilterActionDeleteTest(QObject *parent = Q_NULLPTR);
explicit FilterActionDeleteTest(QObject *parent = nullptr);
~FilterActionDeleteTest();
private Q_SLOTS:
......
......@@ -36,7 +36,7 @@ FilterActionExecTest::~FilterActionExecTest()
void FilterActionExecTest::shouldHaveDefaultValue()
{
MailCommon::FilterActionExec filter;
QWidget *w = filter.createParamWidget(Q_NULLPTR);
QWidget *w = filter.createParamWidget(nullptr);
KUrlRequester *requester = w->findChild<KUrlRequester *>(QStringLiteral("requester"));
QVERIFY(requester);
......
......@@ -24,7 +24,7 @@ class FilterActionExecTest : public QObject
{
Q_OBJECT
public:
explicit FilterActionExecTest(QObject *parent = Q_NULLPTR);
explicit FilterActionExecTest(QObject *parent = nullptr);
~FilterActionExecTest();
private Q_SLOTS:
void shouldHaveDefaultValue();
......
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