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();