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/sslclient.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/sslclient.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/sslclient.ui.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/tools/uic/baseline/sslclient.ui.h b/tests/auto/tools/uic/baseline/sslclient.ui.h index 7c8676eec7..ad3b5b99e4 100644 --- a/tests/auto/tools/uic/baseline/sslclient.ui.h +++ b/tests/auto/tools/uic/baseline/sslclient.ui.h @@ -158,20 +158,20 @@ public: void retranslateUi(QWidget *Form) { - Form->setWindowTitle(QApplication::translate("Form", "Secure Socket Client", Q_NULLPTR)); - hostNameLabel->setText(QApplication::translate("Form", "Host name:", Q_NULLPTR)); - hostNameEdit->setText(QApplication::translate("Form", "imap.example.com", Q_NULLPTR)); - portLabel->setText(QApplication::translate("Form", "Port:", Q_NULLPTR)); - connectButton->setText(QApplication::translate("Form", "Connect to host", Q_NULLPTR)); - sessionBox->setTitle(QApplication::translate("Form", "Active session", Q_NULLPTR)); - cipherText->setText(QApplication::translate("Form", "Cryptographic Cipher:", Q_NULLPTR)); - cipherLabel->setText(QApplication::translate("Form", "<none>", Q_NULLPTR)); + Form->setWindowTitle(QApplication::translate("Form", "Secure Socket Client", nullptr)); + hostNameLabel->setText(QApplication::translate("Form", "Host name:", nullptr)); + hostNameEdit->setText(QApplication::translate("Form", "imap.example.com", nullptr)); + portLabel->setText(QApplication::translate("Form", "Port:", nullptr)); + connectButton->setText(QApplication::translate("Form", "Connect to host", nullptr)); + sessionBox->setTitle(QApplication::translate("Form", "Active session", nullptr)); + cipherText->setText(QApplication::translate("Form", "Cryptographic Cipher:", nullptr)); + cipherLabel->setText(QApplication::translate("Form", "<none>", nullptr)); sessionOutput->setHtml(QApplication::translate("Form", "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>", Q_NULLPTR)); - sessionInputLabel->setText(QApplication::translate("Form", "Input:", Q_NULLPTR)); - sendButton->setText(QApplication::translate("Form", "&Send", Q_NULLPTR)); +"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>", nullptr)); + sessionInputLabel->setText(QApplication::translate("Form", "Input:", nullptr)); + sendButton->setText(QApplication::translate("Form", "&Send", nullptr)); } // retranslateUi }; |