GIT_SILENT: use nullptr now

autotests/conflictresolvertest.cpp

@@ -45,7 +45,7 @@ void ConflictResolverTest::addAttendee(const QString &email, const KCalCore::Fre
     CalendarSupport::FreeBusyItem::Ptr item(new CalendarSupport::FreeBusyItem(KCalCore::Attendee::Ptr(
                                      new KCalCore::Attendee(name, email, false,
                                              KCalCore::Attendee::Accepted,
-                                             role)), Q_NULLPTR));
+                                             role)), nullptr));
     item->setFreeBusy(KCalCore::FreeBusy::Ptr(new KCalCore::FreeBusy(*fb.data())));
     attendees << item;
 }
@@ -66,7 +66,7 @@ void ConflictResolverTest::init()
 void ConflictResolverTest::cleanup()
 {
     delete resolver;
-    resolver = Q_NULLPTR;
+    resolver = nullptr;
     attendees.clear();
 }
 

autotests/modeltest.h

@@ -34,7 +34,7 @@ class ModelTest : public QObject
     Q_OBJECT
 
 public:
-    explicit ModelTest(QAbstractItemModel *model, QObject *parent = Q_NULLPTR);
+    explicit ModelTest(QAbstractItemModel *model, QObject *parent = nullptr);
 
 private Q_SLOTS:
     void nonDestructiveBasicTest();

autotests/testfreebusyganttproxymodel.cpp

@@ -51,7 +51,7 @@ void FreeBusyGanttProxyModelTest::testModelValidity()
     fb1->addPeriod(dt1, KCalCore::Duration(60 * 60));
     fb1->addPeriod(dt2, KCalCore::Duration(60 * 60));
 
-    CalendarSupport::FreeBusyItem::Ptr item1(new CalendarSupport::FreeBusyItem(a1, Q_NULLPTR));
+    CalendarSupport::FreeBusyItem::Ptr item1(new CalendarSupport::FreeBusyItem(a1, nullptr));
     item1->setFreeBusy(fb1);
 
     const KDateTime dt3(QDate(2010, 8, 25), QTime(7, 0, 0), KDateTime::UTC);
@@ -62,7 +62,7 @@ void FreeBusyGanttProxyModelTest::testModelValidity()
     fb2->addPeriod(dt3, KCalCore::Duration(60 * 60));
     fb2->addPeriod(dt4, KCalCore::Duration(60 * 60));
 
-    CalendarSupport::FreeBusyItem::Ptr item2(new CalendarSupport::FreeBusyItem(a2, Q_NULLPTR));
+    CalendarSupport::FreeBusyItem::Ptr item2(new CalendarSupport::FreeBusyItem(a2, nullptr));
     item2->setFreeBusy(fb2);
 
     fbModel->addItem(item1);

autotests/testindividualmaildialog.cpp

@@ -40,7 +40,7 @@ private Q_SLOTS:
 
         attendees << attendee1 << attendee2 << attendee3;
 
-        IndividualMailDialog dialog(QStringLiteral("title"), attendees, buttonYes, buttonNo, Q_NULLPTR);
+        IndividualMailDialog dialog(QStringLiteral("title"), attendees, buttonYes, buttonNo, nullptr);
 
         QCOMPARE(dialog.editAttendees().count(), 0);
         QCOMPARE(dialog.updateAttendees().count(), 3);

src/alarmdialog.h

@@ -55,7 +55,7 @@ public:
       Constructs a new alarm dialog.
       @p incidenceType will influence i18n strings, that will be different for to-dos.
      */
-    explicit AlarmDialog(KCalCore::Incidence::IncidenceType incidenceType, QWidget *parent = Q_NULLPTR);
+    explicit AlarmDialog(KCalCore::Incidence::IncidenceType incidenceType, QWidget *parent = nullptr);
     ~AlarmDialog();
     void load(const KCalCore::Alarm::Ptr &alarm);
     void save(const KCalCore::Alarm::Ptr &alarm) const;

src/alarmpresets.cpp

@@ -97,7 +97,7 @@ void initPresets(AlarmPresets::When when)
     case AlarmPresets::BeforeStart:
 
         for (int i = 0; i < hardcodedPresets.count(); ++i) {
-            KCalCore::Alarm::Ptr alarm(new KCalCore::Alarm(Q_NULLPTR));
+            KCalCore::Alarm::Ptr alarm(new KCalCore::Alarm(nullptr));
             alarm->setType(KCalCore::Alarm::Display);
             const int minutes = hardcodedPresets[i];
             alarm->setStartOffset(-minutes * 60);
@@ -124,7 +124,7 @@ void initPresets(AlarmPresets::When when)
 
     case AlarmPresets::BeforeEnd:
         for (int i = 0; i < hardcodedPresets.count(); ++i) {
-            KCalCore::Alarm::Ptr alarm(new KCalCore::Alarm(Q_NULLPTR));
+            KCalCore::Alarm::Ptr alarm(new KCalCore::Alarm(nullptr));
             alarm->setType(KCalCore::Alarm::Display);
             const int minutes = hardcodedPresets[i];
             alarm->setEndOffset(-minutes * 60);

src/attachmenteditdialog.cpp

@@ -145,7 +145,7 @@ void AttachmentEditDialog::slotApply()
     if (mUi->mStackedWidget->currentIndex() == 0) {
         if (mUi->mInlineCheck->isChecked()) {
             auto job = KIO::storedGet(url);
-            KJobWidgets::setWindow(job, Q_NULLPTR);
+            KJobWidgets::setWindow(job, nullptr);
             if (job->exec()) {
                 QByteArray data  = job->data();
                 mItem->setData(data);

src/attachmenticonview.h

@@ -45,7 +45,7 @@ class AttachmentIconView : public QListWidget
     Q_OBJECT
     friend class EditorAttachments;
 public:
-    explicit AttachmentIconView(QWidget *parent = Q_NULLPTR);
+    explicit AttachmentIconView(QWidget *parent = nullptr);
 
     QMimeData *mimeData() const;
     QUrl tempFileForAttachment(const KCalCore::Attachment::Ptr &attachment) const;

src/attendeecomboboxdelegate.h

@@ -40,7 +40,7 @@ class AttendeeComboBoxDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 public:
-    explicit AttendeeComboBoxDelegate(QObject *parent = Q_NULLPTR);
+    explicit AttendeeComboBoxDelegate(QObject *parent = nullptr);
 
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
     void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;

src/attendeeeditor.h

@@ -46,7 +46,7 @@ class AttendeeEditor : public KPIM::MultiplyingLineEditor
 {
     Q_OBJECT
 public:
-    explicit AttendeeEditor(QWidget *parent = Q_NULLPTR);
+    explicit AttendeeEditor(QWidget *parent = nullptr);
 
     AttendeeData::List attendees() const;
 

src/attendeelineeditdelegate.h

@@ -37,7 +37,7 @@ class AttendeeLineEditDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 public:
-    explicit AttendeeLineEditDelegate(QObject *parent = Q_NULLPTR);
+    explicit AttendeeLineEditDelegate(QObject *parent = nullptr);
 
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
     void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;

src/attendeetablemodel.h

@@ -57,7 +57,7 @@ public:
         Tentative
     };
 
-    explicit AttendeeTableModel(const KCalCore::Attendee::List &resources, QObject *parent = Q_NULLPTR);
+    explicit AttendeeTableModel(const KCalCore::Attendee::List &resources, QObject *parent = nullptr);
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
     int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
@@ -95,7 +95,7 @@ class ResourceFilterProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
-    explicit ResourceFilterProxyModel(QObject *parent = Q_NULLPTR);
+    explicit ResourceFilterProxyModel(QObject *parent = nullptr);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
 };
 
@@ -103,7 +103,7 @@ class AttendeeFilterProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
-    explicit AttendeeFilterProxyModel(QObject *parent = Q_NULLPTR);
+    explicit AttendeeFilterProxyModel(QObject *parent = nullptr);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
 };
 

src/autochecktreewidget.cpp

@@ -52,12 +52,12 @@ AutoCheckTreeWidget::~AutoCheckTreeWidget()
 QTreeWidgetItem *AutoCheckTreeWidget::itemByPath(const QStringList &path) const
 {
     QStringList newPath = path;
-    QTreeWidgetItem *item = Q_NULLPTR;
+    QTreeWidgetItem *item = nullptr;
 
     while (newPath.count()) {
         item = findItem(item, newPath.takeFirst());
         if (!item) {
-            return Q_NULLPTR;
+            return nullptr;
         }
     }
 
@@ -113,7 +113,7 @@ QTreeWidgetItem *AutoCheckTreeWidget::findItem(QTreeWidgetItem *parent, const QS
         }
     }
 
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 void AutoCheckTreeWidget::slotRowsInserted(const QModelIndex &parent,

src/autochecktreewidget.h

@@ -46,7 +46,7 @@ public:
       Default constructor. The default behavior is like a QTreeWidget, so you
       have to activate the autoCheckChildren property manually.
     */
-    explicit AutoCheckTreeWidget(QWidget *parent = Q_NULLPTR);
+    explicit AutoCheckTreeWidget(QWidget *parent = nullptr);
 
     ~AutoCheckTreeWidget();
 

src/categorydialog.cpp

@@ -231,12 +231,12 @@ void CategoryWidget::handleColorChanged(const QColor &newColor)
 }
 
 CategoryDialog::CategoryDialog(CategoryConfig *cc, QWidget *parent)
-    : QDialog(parent), d(Q_NULLPTR)
+    : QDialog(parent), d(nullptr)
 {
     setWindowTitle(i18n("Select Categories"));
     QVBoxLayout *mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
-    QDialogButtonBox *buttonBox = Q_NULLPTR;
+    QDialogButtonBox *buttonBox = nullptr;
 
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel /*| QDialogButtonBox::Help*/ | QDialogButtonBox::Apply);
 

src/categorydialog.h

@@ -42,7 +42,7 @@ class CategoryWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit CategoryWidget(CalendarSupport::CategoryConfig *config, QWidget *parent = Q_NULLPTR);
+    explicit CategoryWidget(CalendarSupport::CategoryConfig *config, QWidget *parent = nullptr);
     ~CategoryWidget();
 
     void setCategories(const QStringList &categoryList = QStringList());
@@ -77,7 +77,7 @@ class CategoryDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit CategoryDialog(CalendarSupport::CategoryConfig *cfg, QWidget *parent = Q_NULLPTR);
+    explicit CategoryDialog(CalendarSupport::CategoryConfig *cfg, QWidget *parent = nullptr);
     ~CategoryDialog();
 
     QStringList selectedCategories() const;

src/categoryeditdialog.h

@@ -43,7 +43,7 @@ class CategoryEditDialog : public QDialog
     Q_OBJECT
 public:
     explicit CategoryEditDialog(CalendarSupport::CategoryConfig *categoryConfig,
-                                QWidget *parent = Q_NULLPTR);
+                                QWidget *parent = nullptr);
 
     ~CategoryEditDialog();
 

src/categoryselectdialog.cpp

@@ -164,12 +164,12 @@ void CategorySelectWidget::setCategoryList(const QStringList &categories)
 }
 
 CategorySelectDialog::CategorySelectDialog(CategoryConfig *cc, QWidget *parent)
-    : QDialog(parent), d(Q_NULLPTR)
+    : QDialog(parent), d(nullptr)
 {
     setWindowTitle(i18n("Select Categories"));
     QVBoxLayout *mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
-    QDialogButtonBox *buttonBox = Q_NULLPTR;
+    QDialogButtonBox *buttonBox = nullptr;
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel /*| QDialogButtonBox::Help*/ | QDialogButtonBox::Apply);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);

src/categoryselectdialog.h

@@ -39,7 +39,7 @@ class CategorySelectWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit CategorySelectWidget(CalendarSupport::CategoryConfig *config, QWidget *parent = Q_NULLPTR);
+    explicit CategorySelectWidget(CalendarSupport::CategoryConfig *config, QWidget *parent = nullptr);
     ~CategorySelectWidget();
 
     void setCategories(const QStringList &categoryList = QStringList());
@@ -72,7 +72,7 @@ class CategorySelectDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit CategorySelectDialog(CalendarSupport::CategoryConfig *cfg, QWidget *parent = Q_NULLPTR);
+    explicit CategorySelectDialog(CalendarSupport::CategoryConfig *cfg, QWidget *parent = nullptr);
     ~CategorySelectDialog();
 
     QStringList selectedCategories() const;

src/combinedincidenceeditor.h

@@ -38,7 +38,7 @@ class CombinedIncidenceEditor : public IncidenceEditor
 {
     Q_OBJECT
 public:
-    explicit CombinedIncidenceEditor(QWidget *parent = Q_NULLPTR);
+    explicit CombinedIncidenceEditor(QWidget *parent = nullptr);
     /**
      * Deletes this editor as well as all editors which are combined into this
      * one.