GIT_SILENT: use nullptr now

src/contactcompletionmodel.cpp

@@ -30,7 +30,7 @@
 
 using namespace Akonadi;
 
-QAbstractItemModel *ContactCompletionModel::mSelf = Q_NULLPTR;
+QAbstractItemModel *ContactCompletionModel::mSelf = nullptr;
 
 QAbstractItemModel *ContactCompletionModel::self()
 {

src/contactdefaultactions.h

@@ -95,7 +95,7 @@ public:
      *
      * @param parent The parent object.
      */
-    explicit ContactDefaultActions(QObject *parent = Q_NULLPTR);
+    explicit ContactDefaultActions(QObject *parent = nullptr);
 
     /**
      * Destroys the contact default actions object.

src/contacteditor.h

@@ -103,7 +103,7 @@ public:
      * @param mode The mode of the editor.
      * @param parent The parent widget of the editor.
      */
-    explicit ContactEditor(Mode mode, QWidget *parent = Q_NULLPTR);
+    explicit ContactEditor(Mode mode, QWidget *parent = nullptr);
 
     /**
      * Creates a new contact editor with a custom editor widget.
@@ -112,7 +112,7 @@ public:
      * @param editorWidget The contact editor widget that shall be used for editing.
      * @param parent The parent widget of the editor.
      */
-    ContactEditor(Mode mode, AbstractContactEditorWidget *editorWidget, QWidget *parent = Q_NULLPTR);
+    ContactEditor(Mode mode, AbstractContactEditorWidget *editorWidget, QWidget *parent = nullptr);
 
     /**
      * Creates a new contact editor dialog with a custom editor widget.
@@ -122,7 +122,7 @@ public:
      * @param parent The parent widget of the dialog.
      * @since 4.10
      */
-    ContactEditor(Mode mode, DisplayMode displayMode, QWidget *parent = Q_NULLPTR);
+    ContactEditor(Mode mode, DisplayMode displayMode, QWidget *parent = nullptr);
 
     /**
      * Destroys the contact editor.

src/contacteditordialog.h

@@ -97,7 +97,7 @@ public:
      * @param mode The mode of the dialog.
      * @param parent The parent widget of the dialog.
      */
-    explicit ContactEditorDialog(Mode mode, QWidget *parent = Q_NULLPTR);
+    explicit ContactEditorDialog(Mode mode, QWidget *parent = nullptr);
 
     /**
      * Creates a new contact editor dialog with a custom editor widget.
@@ -106,7 +106,7 @@ public:
      * @param editorWidget The contact editor widget that shall be used for editing.
      * @param parent The parent widget of the dialog.
      */
-    ContactEditorDialog(Mode mode, AbstractContactEditorWidget *editorWidget, QWidget *parent = Q_NULLPTR);
+    ContactEditorDialog(Mode mode, AbstractContactEditorWidget *editorWidget, QWidget *parent = nullptr);
 
     /**
      * Creates a new contact editor dialog with a custom editor widget.
@@ -116,7 +116,7 @@ public:
      * @param parent The parent widget of the dialog.
      * @since 4.10
      */
-    ContactEditorDialog(Mode mode, DisplayMode displayMode, QWidget *parent = Q_NULLPTR);
+    ContactEditorDialog(Mode mode, DisplayMode displayMode, QWidget *parent = nullptr);
 
     /**
      * Destroys the contact editor dialog.

src/contactgroupeditor.h

@@ -100,7 +100,7 @@ public:
      * @param mode The mode of the editor.
      * @param parent The parent widget of the editor.
      */
-    explicit ContactGroupEditor(Mode mode, QWidget *parent = Q_NULLPTR);
+    explicit ContactGroupEditor(Mode mode, QWidget *parent = nullptr);
 
     /**
      * Destroys the contact group editor.

src/contactgroupeditordialog.cpp

@@ -48,7 +48,7 @@ public:
         , mAddressBookBox(0)
         , mEditor(0)
         , mMode(mode)
-        , okButton(Q_NULLPTR)
+        , okButton(nullptr)
     {
     }
 

src/contactgroupeditordialog.h

@@ -90,7 +90,7 @@ public:
      * @param mode The mode of the dialog.
      * @param parent The parent widget of the dialog.
      */
-    explicit ContactGroupEditorDialog(Mode mode, QWidget *parent = Q_NULLPTR);
+    explicit ContactGroupEditorDialog(Mode mode, QWidget *parent = nullptr);
 
     /**
      * Destroys the contact group editor dialog.

src/contactgrouplineedit.cpp

@@ -190,7 +190,7 @@ QString ContactGroupLineEdit::requestPreferredEmail(const KContacts::Addressee &
         return emails.first();
     }
 
-    QAction *action = Q_NULLPTR;
+    QAction *action = nullptr;
 
     QMenu menu;
     menu.setTitle(i18n("Select preferred email address"));

src/contactgroupviewer.h

@@ -65,7 +65,7 @@ public:
      *
      * @param parent The parent widget.
      */
-    ContactGroupViewer(QWidget *parent = Q_NULLPTR);
+    ContactGroupViewer(QWidget *parent = nullptr);
 
     /**
      * Destroys the contact group viewer.

src/contactgroupviewerdialog.h

@@ -66,7 +66,7 @@ public:
      *
      * @param parent The parent widget of the dialog.
      */
-    ContactGroupViewerDialog(QWidget *parent = Q_NULLPTR);
+    ContactGroupViewerDialog(QWidget *parent = nullptr);
 
     /**
      * Destroys the contact group viewer dialog.

src/contactsfilterproxymodel.h

@@ -74,7 +74,7 @@ public:
      *
      * @param parent The parent object.
      */
-    explicit ContactsFilterProxyModel(QObject *parent = Q_NULLPTR);
+    explicit ContactsFilterProxyModel(QObject *parent = nullptr);
 
     /**
      * Destroys the contacts filter proxy model.

src/contactstreemodel.h

@@ -170,7 +170,7 @@ public:
      * @param monitor The Monitor whose entities should be represented in the model.
      * @param parent The parent object.
      */
-    explicit ContactsTreeModel(Monitor *monitor, QObject *parent = Q_NULLPTR);
+    explicit ContactsTreeModel(Monitor *monitor, QObject *parent = nullptr);
 
     /**
      * Destroys the contacts tree model.

src/contactviewer.cpp

@@ -54,7 +54,7 @@ class Q_DECL_HIDDEN ContactViewer::Private
 public:
     Private(ContactViewer *parent)
         : mParent(parent)
-        , mBrowser(Q_NULLPTR)
+        , mBrowser(nullptr)
         , mParentCollectionFetchJob(0)
     {
         mStandardContactFormatter = new StandardContactFormatter;

src/contactviewer.h

@@ -83,7 +83,7 @@ public:
      *
      * @param parent The parent widget.
      */
-    explicit ContactViewer(QWidget *parent = Q_NULLPTR);
+    explicit ContactViewer(QWidget *parent = nullptr);
 
     /**
      * Destroys the contact viewer.

src/contactviewerdialog.h

@@ -70,7 +70,7 @@ public:
      *
      * @param parent The parent widget of the dialog.
      */
-    explicit ContactViewerDialog(QWidget *parent = Q_NULLPTR);
+    explicit ContactViewerDialog(QWidget *parent = nullptr);
 
     /**
      * Destroys the contact viewer dialog.

src/editor/addresseditor/autotests/addresseslocationviewertest.h

@@ -29,7 +29,7 @@ class AddressesLocationViewerTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit AddressesLocationViewerTest(QObject *parent = Q_NULLPTR);
+    explicit AddressesLocationViewerTest(QObject *parent = nullptr);
     ~AddressesLocationViewerTest();
 private Q_SLOTS:
     void shouldHaveDefaultValue();

src/editor/addresseditor/autotests/addresseslocationwidgettest.h

@@ -29,7 +29,7 @@ class AddressesLocationWidgetTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit AddressesLocationWidgetTest(QObject *parent = Q_NULLPTR);
+    explicit AddressesLocationWidgetTest(QObject *parent = nullptr);
     ~AddressesLocationWidgetTest();
 
 private Q_SLOTS:

src/editor/addresseditor/autotests/addresslocationwidgettest.h

@@ -29,7 +29,7 @@ class AddressLocationWidgetTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit AddressLocationWidgetTest(QObject *parent = Q_NULLPTR);
+    explicit AddressLocationWidgetTest(QObject *parent = nullptr);
     ~AddressLocationWidgetTest();
 
 private Q_SLOTS:

src/editor/contacteditorwidget.cpp

@@ -46,7 +46,7 @@ public:
     Private(ContactEditorWidget::DisplayMode displayMode, ContactEditorWidget *parent)
         : mDisplayMode(displayMode)
         , mParent(parent)
-        , mCustomFieldsWidget(Q_NULLPTR)
+        , mCustomFieldsWidget(nullptr)
     {
     }
 

src/editor/customfieldeditor/autotests/customfieldeditorwidgettest.h

@@ -29,7 +29,7 @@ class CustomFieldEditorWidgetTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit CustomFieldEditorWidgetTest(QObject *parent = Q_NULLPTR);
+    explicit CustomFieldEditorWidgetTest(QObject *parent = nullptr);
     ~CustomFieldEditorWidgetTest();
 private Q_SLOTS:
     void shouldHaveDefaultValue();

src/editor/customfieldeditor/autotests/customfieldslistwidgettest.h

@@ -28,7 +28,7 @@ class CustomFielsListWidgetTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit CustomFielsListWidgetTest(QObject *parent = Q_NULLPTR);
+    explicit CustomFielsListWidgetTest(QObject *parent = nullptr);
     ~CustomFielsListWidgetTest();
 };
 

src/editor/customfieldeditor/autotests/customfieldswidgettest.h

@@ -29,7 +29,7 @@ class CustomFieldsWidgetTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit CustomFieldsWidgetTest(QObject *parent = Q_NULLPTR);
+    explicit CustomFieldsWidgetTest(QObject *parent = nullptr);
     ~CustomFieldsWidgetTest();
 private Q_SLOTS:
     void shouldHaveDefaultValue();

src/editor/generalinfoeditor/autotests/akonadicontactselecttypecomboboxtest.h

@@ -29,7 +29,7 @@ class AkonadiContactSelectTypeComboboxTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit AkonadiContactSelectTypeComboboxTest(QObject *parent = Q_NULLPTR);
+    explicit AkonadiContactSelectTypeComboboxTest(QObject *parent = nullptr);
     ~AkonadiContactSelectTypeComboboxTest();
 private Q_SLOTS:
     void shouldHaveDefaultValue();

src/editor/generalinfoeditor/autotests/mailwidgettest.h

@@ -28,7 +28,7 @@ class MailWidgetTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit MailWidgetTest(QObject *parent = Q_NULLPTR);
+    explicit MailWidgetTest(QObject *parent = nullptr);
     ~MailWidgetTest();
 private Q_SLOTS:
     void shouldHaveDefaultValue();

src/editor/generalinfoeditor/autotests/messagingwidgettest.h

@@ -28,7 +28,7 @@ class MessagingWidgetTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit MessagingWidgetTest(QObject *parent = Q_NULLPTR);
+    explicit MessagingWidgetTest(QObject *parent = nullptr);
     ~MessagingWidgetTest();
 private Q_SLOTS:
     void shouldHaveDefaultValues();

src/editor/generalinfoeditor/autotests/phonewidgettest.h

@@ -28,7 +28,7 @@ class PhoneWidgetTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit PhoneWidgetTest(QObject *parent = Q_NULLPTR);
+    explicit PhoneWidgetTest(QObject *parent = nullptr);
     ~PhoneWidgetTest();
 private Q_SLOTS:
     void shouldHaveDefaultValue();

src/editor/generalinfoeditor/displaynameeditwidget.cpp

@@ -54,7 +54,7 @@ class DisplayNameDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 public:
-    DisplayNameDelegate(QAbstractItemView *view, QObject *parent = Q_NULLPTR)
+    DisplayNameDelegate(QAbstractItemView *view, QObject *parent = nullptr)
         : QStyledItemDelegate(parent)
         , mMaxDescriptionWidth(0)
     {

src/editor/im/improtocols.cpp

@@ -24,7 +24,7 @@
 #include <kiconloader.h>
 #include <kservicetypetrader.h>
 #include <KService>
-IMProtocols *IMProtocols::mSelf = Q_NULLPTR;
+IMProtocols *IMProtocols::mSelf = nullptr;
 
 IMProtocols::IMProtocols()
 {

src/editor/widgets/autotests/preferredlineeditwidgettest.h

@@ -28,7 +28,7 @@ class PreferredLineEditWidget : public QObject
 {
     Q_OBJECT
 public:
-    explicit PreferredLineEditWidget(QObject *parent = Q_NULLPTR);
+    explicit PreferredLineEditWidget(QObject *parent = nullptr);
     ~PreferredLineEditWidget();
 
 private Q_SLOTS:

src/editor/widgets/imagewidget.cpp

@@ -45,7 +45,7 @@
 class ImageLoader
 {
 public:
-    ImageLoader(QWidget *parent = Q_NULLPTR);
+    ImageLoader(QWidget *parent = nullptr);
 
     QImage loadImage(const QUrl &url, bool *ok, bool selectPictureSize = true);
 

src/editor/widgets/kwidgetlister.cpp

@@ -44,8 +44,8 @@ class Q_DECL_HIDDEN KWidgetLister::Private
 public:
     Private(KWidgetLister *qq)
         : q(qq),
-          mLayout(Q_NULLPTR),
-          mButtonBox(Q_NULLPTR),
+          mLayout(nullptr),
+          mButtonBox(nullptr),
           mMinWidgets(0),
           mMaxWidgets(0)
 
@@ -197,7 +197,7 @@ void KWidgetLister::removeWidget(QWidget *widget)
     const int index = d->mWidgetList.indexOf(widget);
     QWidget *w =  d->mWidgetList.takeAt(index);
     w->deleteLater();
-    w = Q_NULLPTR;
+    w = nullptr;
     Q_EMIT widgetRemoved(widget);
     Q_EMIT widgetRemoved();
 

src/emailaddressrequester.cpp

@@ -35,7 +35,7 @@ class Q_DECL_HIDDEN Akonadi::EmailAddressRequester::Private
 {
 public:
     Private(EmailAddressRequester *qq)
-        : q(qq), mLineEdit(Q_NULLPTR)
+        : q(qq), mLineEdit(nullptr)
     {
     }
 

src/emailaddressrequester.h

@@ -46,7 +46,7 @@ public:
      *
      * @param parent The parent widget.
      */
-    explicit EmailAddressRequester(QWidget *parent = Q_NULLPTR);
+    explicit EmailAddressRequester(QWidget *parent = nullptr);
 
     /**
      * Destroys the email address requester.

src/emailaddressselectiondialog.h

@@ -67,7 +67,7 @@ public:
      *
      * @param parent The parent widget.
      */
-    explicit EmailAddressSelectionDialog(QWidget *parent = Q_NULLPTR);
+    explicit EmailAddressSelectionDialog(QWidget *parent = nullptr);
 
     /**
      * Creates a new email address selection dialog.
@@ -75,7 +75,7 @@ public:
      * @param model A custom, ContactsTreeModel based model to use.
      * @param parent The parent widget.
      */
-    explicit EmailAddressSelectionDialog(QAbstractItemModel *model, QWidget *parent = Q_NULLPTR);
+    explicit EmailAddressSelectionDialog(QAbstractItemModel *model, QWidget *parent = nullptr);
 
     /**
      * Destroys the email address selection dialog.

src/emailaddressselectionwidget.cpp

@@ -54,7 +54,7 @@ class SearchLineEdit : public QLineEdit
 {
     Q_OBJECT
 public:
-    SearchLineEdit(QWidget *receiver, QWidget *parent = Q_NULLPTR)
+    SearchLineEdit(QWidget *receiver, QWidget *parent = nullptr)
         : QLineEdit(parent)
         , mReceiver(receiver)
     {

src/emailaddressselectionwidget.h

@@ -74,7 +74,7 @@ public:
      *
      * @param parent The parent widget.
      */
-    explicit EmailAddressSelectionWidget(QWidget *parent = Q_NULLPTR);
+    explicit EmailAddressSelectionWidget(QWidget *parent = nullptr);
 
     /**
      * Creates a new email address selection widget.
@@ -82,7 +82,7 @@ public:
      * @param model A custom, ContactsTreeModel based model to use.
      * @param parent The parent widget.
      */
-    explicit EmailAddressSelectionWidget(QAbstractItemModel *model, QWidget *parent = Q_NULLPTR);
+    explicit EmailAddressSelectionWidget(QAbstractItemModel *model, QWidget *parent = nullptr);
 
     /**
      * @brief Creates a new email address selection widget.
@@ -90,7 +90,7 @@ public:
      * @param model A custom ContactsTreeModel based model to use.
      * @param parent The parent widget.
      */
-    explicit EmailAddressSelectionWidget(bool showOnlyContactWithEmail, QAbstractItemModel *model = Q_NULLPTR, QWidget *parent = Q_NULLPTR);
+    explicit EmailAddressSelectionWidget(bool showOnlyContactWithEmail, QAbstractItemModel *model = nullptr, QWidget *parent = nullptr);
 
     /**
      * Destroys the email address selection widget.

src/selectaddressbookdialog.h

@@ -33,7 +33,7 @@ class AKONADI_CONTACT_EXPORT SelectAddressBookDialog : public Akonadi::Collectio
 {
     Q_OBJECT
 public:
-    explicit SelectAddressBookDialog(QWidget *parent = Q_NULLPTR);
+    explicit SelectAddressBookDialog(QWidget *parent = nullptr);
     ~SelectAddressBookDialog();
 
 private:

src/standardcontactactionmanager.cpp

@@ -571,7 +571,7 @@ QAction *StandardContactActionManager::createAction(Type type)
         return d->mActions.value(type);
     }
 
-    QAction *action = Q_NULLPTR;
+    QAction *action = nullptr;
 
     switch (type) {
     case CreateContact:

src/standardcontactactionmanager.h

@@ -65,7 +65,7 @@ public:
      * @param actionCollection The action collection to operate on.
      * @param parent The parent widget.
      */
-    explicit StandardContactActionManager(KActionCollection *actionCollection, QWidget *parent = Q_NULLPTR);
+    explicit StandardContactActionManager(KActionCollection *actionCollection, QWidget *parent = nullptr);
 
     /**
      * Destroys the standard contact action manager.

src/waitingoverlay_p.h

@@ -40,7 +40,7 @@ public:
      * @param baseWidget must not be null.
      * @param parent must not be equal to baseWidget
      */
-    explicit WaitingOverlay(KJob *job, QWidget *baseWidget, QWidget *parent = Q_NULLPTR);
+    explicit WaitingOverlay(KJob *job, QWidget *baseWidget, QWidget *parent = nullptr);
     ~WaitingOverlay();
 
 protected: