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/default.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/default.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/default.ui.h | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/tests/auto/tools/uic/baseline/default.ui.h b/tests/auto/tools/uic/baseline/default.ui.h index e81f1bc2ca..46dfa8240c 100644 --- a/tests/auto/tools/uic/baseline/default.ui.h +++ b/tests/auto/tools/uic/baseline/default.ui.h @@ -228,84 +228,84 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", Q_NULLPTR)); - exitAction->setText(QApplication::translate("MainWindow", "&Exit", Q_NULLPTR)); - aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", Q_NULLPTR)); - editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", Q_NULLPTR)); - aboutAction->setText(QApplication::translate("MainWindow", "About", Q_NULLPTR)); - nameLabel->setText(QApplication::translate("MainWindow", "&Name:", Q_NULLPTR)); - nameCombo->setItemText(0, QApplication::translate("MainWindow", "Girish", Q_NULLPTR)); - nameCombo->setItemText(1, QApplication::translate("MainWindow", "Jasmin", Q_NULLPTR)); - nameCombo->setItemText(2, QApplication::translate("MainWindow", "Simon", Q_NULLPTR)); - nameCombo->setItemText(3, QApplication::translate("MainWindow", "Zack", Q_NULLPTR)); + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr)); + exitAction->setText(QApplication::translate("MainWindow", "&Exit", nullptr)); + aboutQtAction->setText(QApplication::translate("MainWindow", "About Qt", nullptr)); + editStyleAction->setText(QApplication::translate("MainWindow", "Edit &Style", nullptr)); + aboutAction->setText(QApplication::translate("MainWindow", "About", nullptr)); + nameLabel->setText(QApplication::translate("MainWindow", "&Name:", nullptr)); + nameCombo->setItemText(0, QApplication::translate("MainWindow", "Girish", nullptr)); + nameCombo->setItemText(1, QApplication::translate("MainWindow", "Jasmin", nullptr)); + nameCombo->setItemText(2, QApplication::translate("MainWindow", "Simon", nullptr)); + nameCombo->setItemText(3, QApplication::translate("MainWindow", "Zack", nullptr)); #ifndef QT_NO_TOOLTIP - nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", Q_NULLPTR)); + nameCombo->setToolTip(QApplication::translate("MainWindow", "Specify your name", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - femaleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are female", Q_NULLPTR)); + femaleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are female", nullptr)); #endif // QT_NO_TOOLTIP - femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", Q_NULLPTR)); + femaleRadioButton->setText(QApplication::translate("MainWindow", "&Female", nullptr)); #ifndef QT_NO_TOOLTIP - agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the license before checking this", Q_NULLPTR)); + agreeCheckBox->setToolTip(QApplication::translate("MainWindow", "Please read the license before checking this", nullptr)); #endif // QT_NO_TOOLTIP - agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and conditions", Q_NULLPTR)); + agreeCheckBox->setText(QApplication::translate("MainWindow", "I &accept the terms and conditions", nullptr)); #ifndef QT_NO_TOOLTIP - maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", Q_NULLPTR)); + maleRadioButton->setToolTip(QApplication::translate("MainWindow", "Check this if you are male", nullptr)); #endif // QT_NO_TOOLTIP - maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", Q_NULLPTR)); - genderLabel->setText(QApplication::translate("MainWindow", "Gender:", Q_NULLPTR)); + maleRadioButton->setText(QApplication::translate("MainWindow", "&Male", nullptr)); + genderLabel->setText(QApplication::translate("MainWindow", "Gender:", nullptr)); #ifndef QT_NO_TOOLTIP - ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", Q_NULLPTR)); + ageSpinBox->setToolTip(QApplication::translate("MainWindow", "Specify your age", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age here", Q_NULLPTR)); + ageSpinBox->setStatusTip(QApplication::translate("MainWindow", "Specify your age here", nullptr)); #endif // QT_NO_STATUSTIP - ageLabel->setText(QApplication::translate("MainWindow", "&Age:", Q_NULLPTR)); - passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", Q_NULLPTR)); + ageLabel->setText(QApplication::translate("MainWindow", "&Age:", nullptr)); + passwordLabel->setText(QApplication::translate("MainWindow", "&Password:", nullptr)); #ifndef QT_NO_TOOLTIP - passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", Q_NULLPTR)); + passwordEdit->setToolTip(QApplication::translate("MainWindow", "Specify your password", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password here", Q_NULLPTR)); + passwordEdit->setStatusTip(QApplication::translate("MainWindow", "Specify your password here", nullptr)); #endif // QT_NO_STATUSTIP - passwordEdit->setText(QApplication::translate("MainWindow", "Password", Q_NULLPTR)); - label->setText(QApplication::translate("MainWindow", "Profession", Q_NULLPTR)); - countryLabel->setText(QApplication::translate("MainWindow", "&Country", Q_NULLPTR)); + passwordEdit->setText(QApplication::translate("MainWindow", "Password", nullptr)); + label->setText(QApplication::translate("MainWindow", "Profession", nullptr)); + countryLabel->setText(QApplication::translate("MainWindow", "&Country", nullptr)); const bool __sortingEnabled = professionList->isSortingEnabled(); professionList->setSortingEnabled(false); QListWidgetItem *___qlistwidgetitem = professionList->item(0); - ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", Q_NULLPTR)); + ___qlistwidgetitem->setText(QApplication::translate("MainWindow", "Developer", nullptr)); QListWidgetItem *___qlistwidgetitem1 = professionList->item(1); - ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", Q_NULLPTR)); + ___qlistwidgetitem1->setText(QApplication::translate("MainWindow", "Student", nullptr)); QListWidgetItem *___qlistwidgetitem2 = professionList->item(2); - ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", Q_NULLPTR)); + ___qlistwidgetitem2->setText(QApplication::translate("MainWindow", "Fisherman", nullptr)); professionList->setSortingEnabled(__sortingEnabled); #ifndef QT_NO_TOOLTIP - professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); + professionList->setToolTip(QApplication::translate("MainWindow", "Select your profession", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - professionList->setStatusTip(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); + professionList->setStatusTip(QApplication::translate("MainWindow", "Select your profession", nullptr)); #endif // QT_NO_STATUSTIP #ifndef QT_NO_WHATSTHIS - professionList->setWhatsThis(QApplication::translate("MainWindow", "Select your profession", Q_NULLPTR)); + professionList->setWhatsThis(QApplication::translate("MainWindow", "Select your profession", nullptr)); #endif // QT_NO_WHATSTHIS - countryCombo->setItemText(0, QApplication::translate("MainWindow", "Germany", Q_NULLPTR)); - countryCombo->setItemText(1, QApplication::translate("MainWindow", "India", Q_NULLPTR)); - countryCombo->setItemText(2, QApplication::translate("MainWindow", "Norway", Q_NULLPTR)); - countryCombo->setItemText(3, QApplication::translate("MainWindow", "United States Of America", Q_NULLPTR)); - countryCombo->setItemText(4, QApplication::translate("MainWindow", "United Kingdom", Q_NULLPTR)); + countryCombo->setItemText(0, QApplication::translate("MainWindow", "Germany", nullptr)); + countryCombo->setItemText(1, QApplication::translate("MainWindow", "India", nullptr)); + countryCombo->setItemText(2, QApplication::translate("MainWindow", "Norway", nullptr)); + countryCombo->setItemText(3, QApplication::translate("MainWindow", "United States Of America", nullptr)); + countryCombo->setItemText(4, QApplication::translate("MainWindow", "United Kingdom", nullptr)); #ifndef QT_NO_TOOLTIP - countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify your country", Q_NULLPTR)); + countryCombo->setToolTip(QApplication::translate("MainWindow", "Specify your country", nullptr)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_STATUSTIP - countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify your country here", Q_NULLPTR)); + countryCombo->setStatusTip(QApplication::translate("MainWindow", "Specify your country here", nullptr)); #endif // QT_NO_STATUSTIP - menu_File->setTitle(QApplication::translate("MainWindow", "&File", Q_NULLPTR)); - menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", Q_NULLPTR)); + menu_File->setTitle(QApplication::translate("MainWindow", "&File", nullptr)); + menu_Help->setTitle(QApplication::translate("MainWindow", "&Help", nullptr)); } // retranslateUi }; |