From 1ad74958b92610a2c7c3bc16f40696f1f35f310f Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 2 Jan 2017 14:01:02 +0100 Subject: [PATCH] GIT_SILENT: use nullptr now --- .../src/printing/autotests/grantleeprinttest.cpp | 12 ++++++------ .../src/printing/autotests/grantleeprinttest.h | 2 +- .../src/kaddressbookcontactselectiondialog.cpp | 2 +- .../src/kaddressbookcontactselectiondialog.h | 2 +- .../src/kaddressbookcontactselectionwidget.h | 2 +- .../src/kaddressbookexportselectionwidget.h | 2 +- .../src/kaddressbookimportexportplugin.h | 2 +- .../src/kaddressbookimportexportplugininterface.cpp | 2 +- .../src/kaddressbookimportexportplugininterface.h | 2 +- .../src/kaddressbookimportexportpluginmanager.cpp | 4 ++-- .../src/kaddressbookimportexportpluginmanager.h | 2 +- libsendlater/src/sendlaterdialog.cpp | 2 +- libsendlater/src/sendlaterdialog.h | 2 +- libsendlater/src/sendlatertimedatewidget.h | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp b/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp index 84cb60f..94e61db 100644 --- a/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp +++ b/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.cpp @@ -37,7 +37,7 @@ void GrantleePrintTest::shouldHaveDefaultValue() KAddressBookGrantlee::GrantleePrint *grantleePrint = new KAddressBookGrantlee::GrantleePrint; QVERIFY(grantleePrint); grantleePrint->deleteLater(); - grantleePrint = Q_NULLPTR; + grantleePrint = nullptr; } void GrantleePrintTest::shouldReturnEmptyStringWhenNotContentAndNoContacts() @@ -46,7 +46,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenNotContentAndNoContacts() KContacts::Addressee::List lst; QVERIFY(grantleePrint->contactsToHtml(lst).isEmpty()); grantleePrint->deleteLater(); - grantleePrint = Q_NULLPTR; + grantleePrint = nullptr; } void GrantleePrintTest::shouldReturnEmptyStringWhenAddContentWithoutContacts() @@ -57,7 +57,7 @@ void GrantleePrintTest::shouldReturnEmptyStringWhenAddContentWithoutContacts() QVERIFY(grantleePrint->contactsToHtml(lst).isEmpty()); grantleePrint->deleteLater(); - grantleePrint = Q_NULLPTR; + grantleePrint = nullptr; } void GrantleePrintTest::shouldReturnStringWhenAddContentAndContacts() @@ -72,7 +72,7 @@ void GrantleePrintTest::shouldReturnStringWhenAddContentAndContacts() QCOMPARE(grantleePrint->contactsToHtml(lst), QStringLiteral("foo")); grantleePrint->deleteLater(); - grantleePrint = Q_NULLPTR; + grantleePrint = nullptr; } void GrantleePrintTest::shouldReturnEmails() @@ -87,7 +87,7 @@ void GrantleePrintTest::shouldReturnEmails() QCOMPARE(grantleePrint->contactsToHtml(lst), QStringLiteral("foo1")); grantleePrint->deleteLater(); - grantleePrint = Q_NULLPTR; + grantleePrint = nullptr; } void GrantleePrintTest::shouldDisplayContactInfo_data() @@ -148,7 +148,7 @@ void GrantleePrintTest::shouldDisplayContactInfo() QCOMPARE(grantleePrint->contactsToHtml(lst), result); grantleePrint->deleteLater(); - grantleePrint = Q_NULLPTR; + grantleePrint = nullptr; } QTEST_MAIN(GrantleePrintTest) diff --git a/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h b/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h index 80b492e..678c0de 100644 --- a/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h +++ b/kaddressbookgrantlee/src/printing/autotests/grantleeprinttest.h @@ -26,7 +26,7 @@ class GrantleePrintTest : public QObject { Q_OBJECT public: - explicit GrantleePrintTest(QObject *parent = Q_NULLPTR); + explicit GrantleePrintTest(QObject *parent = nullptr); ~GrantleePrintTest(); private Q_SLOTS: void shouldHaveDefaultValue(); diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp index fcdd40a..9fac510 100644 --- a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp +++ b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.cpp @@ -30,7 +30,7 @@ using namespace KAddressBookImportExport; KAddressBookContactSelectionDialog::KAddressBookContactSelectionDialog(QItemSelectionModel *selectionModel, bool allowToSelectTypeToExport, QWidget *parent) : QDialog(parent), - mVCardExport(Q_NULLPTR) + mVCardExport(nullptr) { setWindowTitle(i18n("Select Contacts")); diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h index 3c0b1f8..307f050 100644 --- a/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h +++ b/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h @@ -54,7 +54,7 @@ public: * @param selectionModel The model that contains the currently selected contacts. * @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. diff --git a/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h b/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h index b07562b..addc12c 100644 --- a/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h +++ b/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h @@ -57,7 +57,7 @@ public: * @param selectionModel The model that contains the currently selected contacts. * @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. diff --git a/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h b/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h index d1af84f..ec73f17 100644 --- a/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h +++ b/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h @@ -29,7 +29,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookExportSelectionWidget : publi { Q_OBJECT public: - explicit KAddressBookExportSelectionWidget(QWidget *parent = Q_NULLPTR); + explicit KAddressBookExportSelectionWidget(QWidget *parent = nullptr); ~KAddressBookExportSelectionWidget(); enum ExportField { None = 0, diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugin.h b/kaddressbookimportexport/src/kaddressbookimportexportplugin.h index cf2853e..6c404ac 100644 --- a/kaddressbookimportexport/src/kaddressbookimportexportplugin.h +++ b/kaddressbookimportexport/src/kaddressbookimportexportplugin.h @@ -30,7 +30,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPlugin : public P { Q_OBJECT public: - explicit KAddressBookImportExportPlugin(QObject *parent = Q_NULLPTR); + explicit KAddressBookImportExportPlugin(QObject *parent = nullptr); ~KAddressBookImportExportPlugin(); }; } diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp index 7fef9db..a023ef3 100644 --- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp +++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.cpp @@ -24,7 +24,7 @@ using namespace KAddressBookImportExport; KAddressBookImportExportPluginInterface::KAddressBookImportExportPluginInterface(QObject *parent) : PimCommon::AbstractGenericPluginInterface(parent), mImportExportAction(Import), - mItemSelectionModel(Q_NULLPTR) + mItemSelectionModel(nullptr) { } diff --git a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h index 5ffaa48..5812f28 100644 --- a/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h +++ b/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h @@ -31,7 +31,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginInterface : { Q_OBJECT public: - explicit KAddressBookImportExportPluginInterface(QObject *parent = Q_NULLPTR); + explicit KAddressBookImportExportPluginInterface(QObject *parent = nullptr); ~KAddressBookImportExportPluginInterface(); enum ImportExportAction { diff --git a/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp b/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp index 8110654..bb66859 100644 --- a/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp +++ b/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.cpp @@ -49,7 +49,7 @@ class KAddressBookImportExportInfo { public: KAddressBookImportExportInfo() - : plugin(Q_NULLPTR), + : plugin(nullptr), isEnabled(true) { @@ -120,7 +120,7 @@ bool KAddressBookImportExportPrivate::initializePlugins() if (unique.contains(info.metaDataFileNameBaseName)) { continue; } - info.plugin = Q_NULLPTR; + info.plugin = nullptr; mPluginList.push_back(info); unique.insert(info.metaDataFileNameBaseName); } else { diff --git a/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h b/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h index d8a10ba..de77919 100644 --- a/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h +++ b/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h @@ -32,7 +32,7 @@ class KADDRESSBOOK_IMPORTEXPORT_EXPORT KAddressBookImportExportPluginManager : p { Q_OBJECT public: - explicit KAddressBookImportExportPluginManager(QObject *parent = Q_NULLPTR); + explicit KAddressBookImportExportPluginManager(QObject *parent = nullptr); ~KAddressBookImportExportPluginManager(); static KAddressBookImportExportPluginManager *self(); diff --git a/libsendlater/src/sendlaterdialog.cpp b/libsendlater/src/sendlaterdialog.cpp index 8746843..e452c5e 100644 --- a/libsendlater/src/sendlaterdialog.cpp +++ b/libsendlater/src/sendlaterdialog.cpp @@ -36,7 +36,7 @@ using namespace SendLater; SendLaterDialog::SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent) : QDialog(parent), mAction(Unknown), - mDelay(Q_NULLPTR), + mDelay(nullptr), mInfo(info) { setWindowTitle(i18nc("@title:window", "Send Later")); diff --git a/libsendlater/src/sendlaterdialog.h b/libsendlater/src/sendlaterdialog.h index 455eb46..00f83b3 100644 --- a/libsendlater/src/sendlaterdialog.h +++ b/libsendlater/src/sendlaterdialog.h @@ -44,7 +44,7 @@ public: PutInOutbox = 3 }; - explicit SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent = Q_NULLPTR); + explicit SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent = nullptr); ~SendLaterDialog(); SendLater::SendLaterInfo *info(); diff --git a/libsendlater/src/sendlatertimedatewidget.h b/libsendlater/src/sendlatertimedatewidget.h index f5d123a..ed08080 100644 --- a/libsendlater/src/sendlatertimedatewidget.h +++ b/libsendlater/src/sendlatertimedatewidget.h @@ -32,7 +32,7 @@ class SendLaterTimeDateWidget : public QWidget { Q_OBJECT public: - explicit SendLaterTimeDateWidget(QWidget *parent = Q_NULLPTR); + explicit SendLaterTimeDateWidget(QWidget *parent = nullptr); ~SendLaterTimeDateWidget(); void setDateTime(const QDateTime &); -- GitLab