Commit 1ad74958 authored by Laurent Montel's avatar Laurent Montel 😁

GIT_SILENT: use nullptr now

parent 8d889bd0
...@@ -37,7 +37,7 @@ void GrantleePrintTest::shouldHaveDefaultValue() ...@@ -37,7 +37,7 @@ void GrantleePrintTest::shouldHaveDefaultValue()
KAddressBookGrantlee::GrantleePrint *grantleePrint = new KAddressBookGrantlee::GrantleePrint; KAddressBookGrantlee::GrantleePrint *grantleePrint = new KAddressBookGrantlee::GrantleePrint;
QVERIFY(grantleePrint); QVERIFY(grantleePrint);
grantleePrint->deleteLater(); grantleePrint->deleteLater();
grantleePrint = Q_NULLPTR; grantleePrint = nullptr;
} }
void GrantleePrintTest::shouldReturnEmptyStringWhenNotContentAndNoContacts() void GrantleePrintTest::shouldReturnEmptyStringWhenNotContentAndNoContacts()
...@@ -46,7 +46,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenNotContentAndNoContacts() ...@@ -46,7 +46,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenNotContentAndNoContacts()
KContacts::Addressee::List lst; KContacts::Addressee::List lst;
QVERIFY(grantleePrint->contactsToHtml(lst).isEmpty()); QVERIFY(grantleePrint->contactsToHtml(lst).isEmpty());
grantleePrint->deleteLater(); grantleePrint->deleteLater();
grantleePrint = Q_NULLPTR; grantleePrint = nullptr;
} }
void GrantleePrintTest::shouldReturnEmptyStringWhenAddContentWithoutContacts() void GrantleePrintTest::shouldReturnEmptyStringWhenAddContentWithoutContacts()
...@@ -57,7 +57,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenAddContentWithoutContacts() ...@@ -57,7 +57,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenAddContentWithoutContacts()
QVERIFY(grantleePrint->contactsToHtml(lst).isEmpty()); QVERIFY(grantleePrint->contactsToHtml(lst).isEmpty());
grantleePrint->deleteLater(); grantleePrint->deleteLater();
grantleePrint = Q_NULLPTR; grantleePrint = nullptr;
} }
void GrantleePrintTest::shouldReturnStringWhenAddContentAndContacts() void GrantleePrintTest::shouldReturnStringWhenAddContentAndContacts()
...@@ -72,7 +72,7 @@ void GrantleePrintTest::shouldReturnStringWhenAddContentAndContacts() ...@@ -72,7 +72,7 @@ void GrantleePrintTest::shouldReturnStringWhenAddContentAndContacts()
QCOMPARE(grantleePrint->contactsToHtml(lst), QStringLiteral("foo")); QCOMPARE(grantleePrint->contactsToHtml(lst), QStringLiteral("foo"));
grantleePrint->deleteLater(); grantleePrint->deleteLater();
grantleePrint = Q_NULLPTR; grantleePrint = nullptr;
} }
void GrantleePrintTest::shouldReturnEmails() void GrantleePrintTest::shouldReturnEmails()
...@@ -87,7 +87,7 @@ void GrantleePrintTest::shouldReturnEmails() ...@@ -87,7 +87,7 @@ void GrantleePrintTest::shouldReturnEmails()
QCOMPARE(grantleePrint->contactsToHtml(lst), QStringLiteral("foo1")); QCOMPARE(grantleePrint->contactsToHtml(lst), QStringLiteral("foo1"));
grantleePrint->deleteLater(); grantleePrint->deleteLater();
grantleePrint = Q_NULLPTR; grantleePrint = nullptr;
} }
void GrantleePrintTest::shouldDisplayContactInfo_data() void GrantleePrintTest::shouldDisplayContactInfo_data()
...@@ -148,7 +148,7 @@ void GrantleePrintTest::shouldDisplayContactInfo() ...@@ -148,7 +148,7 @@ void GrantleePrintTest::shouldDisplayContactInfo()
QCOMPARE(grantleePrint->contactsToHtml(lst), result); QCOMPARE(grantleePrint->contactsToHtml(lst), result);
grantleePrint->deleteLater(); grantleePrint->deleteLater();
grantleePrint = Q_NULLPTR; grantleePrint = nullptr;
} }
QTEST_MAIN(GrantleePrintTest) QTEST_MAIN(GrantleePrintTest)
...@@ -26,7 +26,7 @@ class GrantleePrintTest : public QObject ...@@ -26,7 +26,7 @@ class GrantleePrintTest : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit GrantleePrintTest(QObject *parent = Q_NULLPTR); explicit GrantleePrintTest(QObject *parent = nullptr);
~GrantleePrintTest(); ~GrantleePrintTest();
private Q_SLOTS: private Q_SLOTS:
void shouldHaveDefaultValue(); void shouldHaveDefaultValue();
......
...@@ -30,7 +30,7 @@ using namespace KAddressBookImportExport; ...@@ -30,7 +30,7 @@ using namespace KAddressBookImportExport;
KAddressBookContactSelectionDialog::KAddressBookContactSelectionDialog(QItemSelectionModel *selectionModel, bool allowToSelectTypeToExport, KAddressBookContactSelectionDialog::KAddressBookContactSelectionDialog(QItemSelectionModel *selectionModel, bool allowToSelectTypeToExport,
QWidget *parent) QWidget *parent)
: QDialog(parent), : QDialog(parent),
mVCardExport(Q_NULLPTR) mVCardExport(nullptr)
{ {
setWindowTitle(i18n("Select Contacts")); setWindowTitle(i18n("Select Contacts"));
......
...@@ -54,7 +54,7 @@ public: ...@@ -54,7 +54,7 @@ public:
* @param selectionModel The model that contains the currently selected contacts. * @param selectionModel The model that contains the currently selected contacts.
* @param parent The parent widget. * @param parent The parent widget.
*/ */
explicit KAddressBookContactSelectionDialog(QItemSelectionModel *selectionModel, bool allowToSelectTypeToExport, QWidget *parent = Q_NULLPTR); explicit KAddressBookContactSelectionDialog(QItemSelectionModel *selectionModel, bool allowToSelectTypeToExport, QWidget *parent = nullptr);
/** /**
* Sets the @p message text. * Sets the @p message text.
......
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
* @param selectionModel The model that contains the currently selected contacts. * @param selectionModel The model that contains the currently selected contacts.
* @param parent The parent widget. * @param parent The parent widget.
*/ */
explicit KAddressBookContactSelectionWidget(QItemSelectionModel *selectionModel, QWidget *parent = Q_NULLPTR); explicit KAddressBookContactSelectionWidget(QItemSelectionModel *selectionModel, QWidget *parent = nullptr);
/** /**
* Sets the @p message text. * Sets the @p message text.
......
...@@ -29,7 +29,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookExportSelectionWidget : publi ...@@ -29,7 +29,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookExportSelectionWidget : publi
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit KAddressBookExportSelectionWidget(QWidget *parent = Q_NULLPTR); explicit KAddressBookExportSelectionWidget(QWidget *parent = nullptr);
~KAddressBookExportSelectionWidget(); ~KAddressBookExportSelectionWidget();
enum ExportField { enum ExportField {
None = 0, None = 0,
......
...@@ -30,7 +30,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPlugin : public P ...@@ -30,7 +30,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPlugin : public P
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit KAddressBookImportExportPlugin(QObject *parent = Q_NULLPTR); explicit KAddressBookImportExportPlugin(QObject *parent = nullptr);
~KAddressBookImportExportPlugin(); ~KAddressBookImportExportPlugin();
}; };
} }
......
...@@ -24,7 +24,7 @@ using namespace KAddressBookImportExport; ...@@ -24,7 +24,7 @@ using namespace KAddressBookImportExport;
KAddressBookImportExportPluginInterface::KAddressBookImportExportPluginInterface(QObject *parent) KAddressBookImportExportPluginInterface::KAddressBookImportExportPluginInterface(QObject *parent)
: PimCommon::AbstractGenericPluginInterface(parent), : PimCommon::AbstractGenericPluginInterface(parent),
mImportExportAction(Import), mImportExportAction(Import),
mItemSelectionModel(Q_NULLPTR) mItemSelectionModel(nullptr)
{ {
} }
......
...@@ -31,7 +31,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginInterface : ...@@ -31,7 +31,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginInterface :
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit KAddressBookImportExportPluginInterface(QObject *parent = Q_NULLPTR); explicit KAddressBookImportExportPluginInterface(QObject *parent = nullptr);
~KAddressBookImportExportPluginInterface(); ~KAddressBookImportExportPluginInterface();
enum ImportExportAction { enum ImportExportAction {
......
...@@ -49,7 +49,7 @@ class KAddressBookImportExportInfo ...@@ -49,7 +49,7 @@ class KAddressBookImportExportInfo
{ {
public: public:
KAddressBookImportExportInfo() KAddressBookImportExportInfo()
: plugin(Q_NULLPTR), : plugin(nullptr),
isEnabled(true) isEnabled(true)
{ {
...@@ -120,7 +120,7 @@ bool KAddressBookImportExportPrivate::initializePlugins() ...@@ -120,7 +120,7 @@ bool KAddressBookImportExportPrivate::initializePlugins()
if (unique.contains(info.metaDataFileNameBaseName)) { if (unique.contains(info.metaDataFileNameBaseName)) {
continue; continue;
} }
info.plugin = Q_NULLPTR; info.plugin = nullptr;
mPluginList.push_back(info); mPluginList.push_back(info);
unique.insert(info.metaDataFileNameBaseName); unique.insert(info.metaDataFileNameBaseName);
} else { } else {
......
...@@ -32,7 +32,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginManager : p ...@@ -32,7 +32,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginManager : p
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit KAddressBookImportExportPluginManager(QObject *parent = Q_NULLPTR); explicit KAddressBookImportExportPluginManager(QObject *parent = nullptr);
~KAddressBookImportExportPluginManager(); ~KAddressBookImportExportPluginManager();
static KAddressBookImportExportPluginManager *self(); static KAddressBookImportExportPluginManager *self();
......
...@@ -36,7 +36,7 @@ using namespace SendLater; ...@@ -36,7 +36,7 @@ using namespace SendLater;
SendLaterDialog::SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent) SendLaterDialog::SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent)
: QDialog(parent), : QDialog(parent),
mAction(Unknown), mAction(Unknown),
mDelay(Q_NULLPTR), mDelay(nullptr),
mInfo(info) mInfo(info)
{ {
setWindowTitle(i18nc("@title:window", "Send Later")); setWindowTitle(i18nc("@title:window", "Send Later"));
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
PutInOutbox = 3 PutInOutbox = 3
}; };
explicit SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent = Q_NULLPTR); explicit SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent = nullptr);
~SendLaterDialog(); ~SendLaterDialog();
SendLater::SendLaterInfo *info(); SendLater::SendLaterInfo *info();
......
...@@ -32,7 +32,7 @@ class SendLaterTimeDateWidget : public QWidget ...@@ -32,7 +32,7 @@ class SendLaterTimeDateWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit SendLaterTimeDateWidget(QWidget *parent = Q_NULLPTR); explicit SendLaterTimeDateWidget(QWidget *parent = nullptr);
~SendLaterTimeDateWidget(); ~SendLaterTimeDateWidget();
void setDateTime(const QDateTime &); void setDateTime(const QDateTime &);
......
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