diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-08-28 17:42:50 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-08-28 15:25:07 +0000 |
commit | d61e61fa1a98fca48e35338a5672f586a1d31143 (patch) | |
tree | 1bf9550aec2da3705a7ad6e8f83b857e28cec8af /tests/auto/tools/uic/baseline/qfiledialog.ui.h | |
parent | eeaaac8f0e18680f80a142492675fa90a743f4ec (diff) |
uic: Use nullptr instead of Q_NULLPTR in generated code
nullptr can be used directly in the Qt code since Qt 5.7.
Use it in generated code for consistency.
Change-Id: I249aeaf0a39b46ce1106b29d3ea4569a399908b7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'tests/auto/tools/uic/baseline/qfiledialog.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/qfiledialog.ui.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/tools/uic/baseline/qfiledialog.ui.h b/tests/auto/tools/uic/baseline/qfiledialog.ui.h index 24bf810f72..98b05c34b6 100644 --- a/tests/auto/tools/uic/baseline/qfiledialog.ui.h +++ b/tests/auto/tools/uic/baseline/qfiledialog.ui.h @@ -273,26 +273,26 @@ public: void retranslateUi(QDialog *QFileDialog) { - lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", Q_NULLPTR)); + lookInLabel->setText(QApplication::translate("QFileDialog", "Look in:", nullptr)); #ifndef QT_NO_TOOLTIP - backButton->setToolTip(QApplication::translate("QFileDialog", "Back", Q_NULLPTR)); + backButton->setToolTip(QApplication::translate("QFileDialog", "Back", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", Q_NULLPTR)); + forwardButton->setToolTip(QApplication::translate("QFileDialog", "Forward", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", Q_NULLPTR)); + toParentButton->setToolTip(QApplication::translate("QFileDialog", "Parent Directory", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", Q_NULLPTR)); + newFolderButton->setToolTip(QApplication::translate("QFileDialog", "Create New Folder", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", Q_NULLPTR)); + listModeButton->setToolTip(QApplication::translate("QFileDialog", "List View", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", Q_NULLPTR)); + detailModeButton->setToolTip(QApplication::translate("QFileDialog", "Detail View", nullptr)); #endif // QT_NO_TOOLTIP - fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", Q_NULLPTR)); + fileTypeLabel->setText(QApplication::translate("QFileDialog", "Files of type:", nullptr)); Q_UNUSED(QFileDialog); } // retranslateUi |