From 7b72dcb062d23eed3ebf4e52cba3abd1fd67d03e Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 8 Jun 2020 12:24:55 +0200 Subject: [PATCH] Qt5: 'QString::null' is deprecated: use QString() [-Wdeprecated-declarations] --- src/Gui/Command.cpp | 2 +- src/Gui/DlgActionsImp.cpp | 8 ++++---- src/Gui/DlgMacroExecuteImp.cpp | 2 +- src/Gui/DlgParameterImp.cpp | 18 +++++++++--------- src/Gui/DlgSettingsImageImp.cpp | 4 ++-- src/Gui/EditorView.cpp | 2 +- src/Gui/FileDialog.cpp | 6 +++--- src/Gui/NetworkRetriever.cpp | 4 ++-- src/Gui/NetworkRetriever.h | 2 +- src/Gui/PythonConsole.cpp | 6 +++--- src/Mod/Drawing/Gui/Command.cpp | 4 ++-- src/Mod/Image/Gui/Command.cpp | 4 ++-- src/Mod/Part/Gui/DlgPartImportIgesImp.cpp | 2 +- src/Mod/Part/Gui/DlgPartImportStepImp.cpp | 2 +- src/Mod/Points/Gui/Command.cpp | 4 ++-- src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp | 2 +- src/Mod/Spreadsheet/Gui/qtcolorpicker.h | 2 +- src/Mod/TechDraw/Gui/Command.cpp | 2 +- src/Mod/TechDraw/Gui/CommandDecorate.cpp | 2 +- src/Mod/Test/Gui/UnitTestImp.h | 2 +- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp index cbe4f5d98f..c6c139757d 100644 --- a/src/Gui/Command.cpp +++ b/src/Gui/Command.cpp @@ -119,7 +119,7 @@ using namespace Gui::DockWnd; * void activated(int) * { * QString filter ... // make a filter of all supported file formats - * QStringList FileList = QFileDialog::getOpenFileNames( filter,QString::null, getMainWindow() ); + * QStringList FileList = QFileDialog::getOpenFileNames( filter,QString(), getMainWindow() ); * for ( QStringList::Iterator it = FileList.begin(); it != FileList.end(); ++it ) { * getGuiApplication()->open((*it).latin1()); * } diff --git a/src/Gui/DlgActionsImp.cpp b/src/Gui/DlgActionsImp.cpp index 0a6c64c724..40a733c462 100644 --- a/src/Gui/DlgActionsImp.cpp +++ b/src/Gui/DlgActionsImp.cpp @@ -216,7 +216,7 @@ void DlgCustomActionsImp::on_actionListWidget_itemActivated(QTreeWidgetItem *ite ui->actionStatus -> setText(QString::fromUtf8(pScript->getStatusTip())); ui->actionAccel -> setText(QString::fromLatin1(pScript->getAccel())); ui->pixmapLabel->clear(); - m_sPixmap = QString::null; + m_sPixmap.clear(); const char* name = pScript->getPixmap(); if (name && std::strlen(name) > 2) { @@ -278,7 +278,7 @@ void DlgCustomActionsImp::on_buttonAddAction_clicked() if (!m_sPixmap.isEmpty()) macro->setPixmap(m_sPixmap.toLatin1()); ui->pixmapLabel->clear(); - m_sPixmap = QString::null; + m_sPixmap.clear(); if (!ui->actionAccel->text().isEmpty()) { macro->setAccel(ui->actionAccel->text().toLatin1()); @@ -335,7 +335,7 @@ void DlgCustomActionsImp::on_buttonReplaceAction_clicked() if (!m_sPixmap.isEmpty()) macro->setPixmap(m_sPixmap.toLatin1()); ui->pixmapLabel->clear(); - m_sPixmap = QString::null; + m_sPixmap.clear(); if (!ui->actionAccel->text().isEmpty()) { macro->setAccel(ui->actionAccel->text().toLatin1()); @@ -501,7 +501,7 @@ void DlgCustomActionsImp::on_buttonChoosePixmap_clicked() dlg.exec(); ui->pixmapLabel->clear(); - m_sPixmap = QString::null; + m_sPixmap.clear(); if (dlg.result() == QDialog::Accepted) { QListWidgetItem* item = dlg.currentItem(); if (item) { diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp index 95f06680f2..95870d03b6 100644 --- a/src/Gui/DlgMacroExecuteImp.cpp +++ b/src/Gui/DlgMacroExecuteImp.cpp @@ -350,7 +350,7 @@ void DlgMacroExecuteImp::on_createButton_clicked() { // query file name QString fn = QInputDialog::getText(this, tr("Macro file"), tr("Enter a file name, please:"), - QLineEdit::Normal, QString::null, 0); + QLineEdit::Normal, QString(), 0); if (!fn.isEmpty()) { QString suffix = QFileInfo(fn).suffix().toLower(); diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp index 63b5df542f..0d87d383f4 100644 --- a/src/Gui/DlgParameterImp.cpp +++ b/src/Gui/DlgParameterImp.cpp @@ -550,7 +550,7 @@ void ParameterGroup::onCreateSubgroup() { bool ok; QString name = QInputDialog::getText(this, QObject::tr("New sub-group"), QObject::tr("Enter the name:"), - QLineEdit::Normal, QString::null, &ok ); + QLineEdit::Normal, QString(), &ok ); if (ok && Gui::validateInput(this, name)) { @@ -577,7 +577,7 @@ void ParameterGroup::onCreateSubgroup() void ParameterGroup::onExportToFile() { QString file = FileDialog::getSaveFileName( this, tr("Export parameter to file"), - QString::null, QString::fromLatin1("XML (*.FCParam)")); + QString(), QString::fromLatin1("XML (*.FCParam)")); if ( !file.isEmpty() ) { QTreeWidgetItem* item = currentItem(); @@ -593,7 +593,7 @@ void ParameterGroup::onExportToFile() void ParameterGroup::onImportFromFile() { QString file = FileDialog::getOpenFileName( this, tr("Import parameter from file"), - QString::null, QString::fromLatin1("XML (*.FCParam)")); + QString(), QString::fromLatin1("XML (*.FCParam)")); if ( !file.isEmpty() ) { QTreeWidgetItem* item = currentItem(); @@ -771,7 +771,7 @@ void ParameterValue::onCreateTextItem() { bool ok; QString name = QInputDialog::getText(this, QObject::tr("New text item"), QObject::tr("Enter the name:"), - QLineEdit::Normal, QString::null, &ok); + QLineEdit::Normal, QString(), &ok); if (!ok || !Gui::validateInput(this, name)) return; @@ -787,7 +787,7 @@ void ParameterValue::onCreateTextItem() } QString val = QInputDialog::getText(this, QObject::tr("New text item"), QObject::tr("Enter your text:"), - QLineEdit::Normal, QString::null, &ok); + QLineEdit::Normal, QString(), &ok); if ( ok && !val.isEmpty() ) { ParameterValueItem *pcItem; @@ -800,7 +800,7 @@ void ParameterValue::onCreateIntItem() { bool ok; QString name = QInputDialog::getText(this, QObject::tr("New integer item"), QObject::tr("Enter the name:"), - QLineEdit::Normal, QString::null, &ok); + QLineEdit::Normal, QString(), &ok); if (!ok || !Gui::validateInput(this, name)) return; @@ -830,7 +830,7 @@ void ParameterValue::onCreateUIntItem() { bool ok; QString name = QInputDialog::getText(this, QObject::tr("New unsigned item"), QObject::tr("Enter the name:"), - QLineEdit::Normal, QString::null, &ok); + QLineEdit::Normal, QString(), &ok); if (!ok || !Gui::validateInput(this, name)) return; @@ -866,7 +866,7 @@ void ParameterValue::onCreateFloatItem() { bool ok; QString name = QInputDialog::getText(this, QObject::tr("New float item"), QObject::tr("Enter the name:"), - QLineEdit::Normal, QString::null, &ok); + QLineEdit::Normal, QString(), &ok); if (!ok || !Gui::validateInput(this, name)) return; @@ -895,7 +895,7 @@ void ParameterValue::onCreateBoolItem() { bool ok; QString name = QInputDialog::getText(this, QObject::tr("New Boolean item"), QObject::tr("Enter the name:"), - QLineEdit::Normal, QString::null, &ok); + QLineEdit::Normal, QString(), &ok); if (!ok || !Gui::validateInput(this, name)) return; diff --git a/src/Gui/DlgSettingsImageImp.cpp b/src/Gui/DlgSettingsImageImp.cpp index cc17e19e82..e8a326a604 100644 --- a/src/Gui/DlgSettingsImageImp.cpp +++ b/src/Gui/DlgSettingsImageImp.cpp @@ -134,12 +134,12 @@ int DlgSettingsImageImp::imageHeight() const /** * Returns the comment of the picture. If for the currently selected image format no comments are supported - * QString::null is returned. + * QString() is returned. */ QString DlgSettingsImageImp::comment() const { if ( !ui->textEditComment->isEnabled() ) - return QString::null; + return QString(); else return ui->textEditComment->toPlainText(); } diff --git a/src/Gui/EditorView.cpp b/src/Gui/EditorView.cpp index 59676de47b..27e9127263 100644 --- a/src/Gui/EditorView.cpp +++ b/src/Gui/EditorView.cpp @@ -328,7 +328,7 @@ void EditorView::setDisplayName(EditorView::DisplayName type) bool EditorView::saveAs(void) { QString fn = FileDialog::getSaveFileName(this, QObject::tr("Save Macro"), - QString::null, QString::fromLatin1("%1 (*.FCMacro);;Python (*.py)").arg(tr("FreeCAD macro"))); + QString(), QString::fromLatin1("%1 (*.FCMacro);;Python (*.py)").arg(tr("FreeCAD macro"))); if (fn.isEmpty()) return false; setCurrentFileName(fn); diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp index 79c957c097..7a982f4587 100644 --- a/src/Gui/FileDialog.cpp +++ b/src/Gui/FileDialog.cpp @@ -221,7 +221,7 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption, setWorkingDirectory(file); return file; } else { - return QString::null; + return QString(); } } @@ -316,7 +316,7 @@ QString FileDialog::getOpenFileName(QWidget * parent, const QString & caption, c setWorkingDirectory(file); return file; } else { - return QString::null; + return QString(); } } @@ -622,7 +622,7 @@ FileChooser::FileChooser ( QWidget * parent ) : QWidget(parent) , md( File ) , accMode( AcceptOpen ) - , _filter( QString::null ) + , _filter( QString() ) { QHBoxLayout *layout = new QHBoxLayout( this ); layout->setMargin( 0 ); diff --git a/src/Gui/NetworkRetriever.cpp b/src/Gui/NetworkRetriever.cpp index 581b4fd9d9..646a8baf7d 100644 --- a/src/Gui/NetworkRetriever.cpp +++ b/src/Gui/NetworkRetriever.cpp @@ -460,8 +460,8 @@ void StdCmdDownloadOnlineHelp::activated(int iMsg) bool bAuthor = hGrp->GetBool ("Authorize", false); if (bUseProxy) { - QString username = QString::null; - QString password = QString::null; + QString username; + QString password; if (bAuthor) { QDialog dlg(getMainWindow()); diff --git a/src/Gui/NetworkRetriever.h b/src/Gui/NetworkRetriever.h index 03cae67e1a..1a90dde4b3 100644 --- a/src/Gui/NetworkRetriever.h +++ b/src/Gui/NetworkRetriever.h @@ -48,7 +48,7 @@ public: void setNumberOfTries( int ); void setOutputFile( const QString& ); void setEnableTimestamp(bool); - void setProxy( const QString&, const QString& = QString::null, const QString& = QString::null ); + void setProxy( const QString&, const QString& = QString(), const QString& = QString() ); void setEnableRecursive( bool, int = 0 ); void setFollowRelative( bool ); void setEnableConvert( bool ); diff --git a/src/Gui/PythonConsole.cpp b/src/Gui/PythonConsole.cpp index 360a3eaf2f..21fc9ce5c4 100644 --- a/src/Gui/PythonConsole.cpp +++ b/src/Gui/PythonConsole.cpp @@ -720,13 +720,13 @@ void PythonConsole::printPrompt(PythonConsole::Prompt mode) // write normal messages if (!d->output.isEmpty()) { appendOutput(d->output, (int)PythonConsoleP::Message); - d->output = QString::null; + d->output.clear(); } // write error messages if (!d->error.isEmpty()) { appendOutput(d->error, (int)PythonConsoleP::Error); - d->error = QString::null; + d->error.clear(); } // Append the prompt string @@ -1326,7 +1326,7 @@ void PythonConsole::onSaveHistoryAs() void PythonConsole::onInsertFileName() { - QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), tr("Insert file name"), QString::null, + QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), tr("Insert file name"), QString(), QString::fromLatin1("%1 (*.*)").arg(tr("All Files"))); if ( fn.isEmpty() ) return; diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp index ab4351cfa3..5114064418 100644 --- a/src/Mod/Drawing/Gui/Command.cpp +++ b/src/Mod/Drawing/Gui/Command.cpp @@ -69,7 +69,7 @@ void CmdDrawingOpen::activated(int iMsg) { Q_UNUSED(iMsg); // Reading an image - QString filename = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Choose an SVG file to open"), QString::null, + QString filename = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Choose an SVG file to open"), QString(), QString::fromLatin1("%1 (*.svg *.svgz)").arg(QObject::tr("Scalable Vector Graphic"))); if (!filename.isEmpty()) { @@ -592,7 +592,7 @@ void CmdDrawingSymbol::activated(int iMsg) } } // Reading an image - QString filename = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Choose an SVG file to open"), QString::null, + QString filename = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Choose an SVG file to open"), QString(), QString::fromLatin1("%1 (*.svg *.svgz)").arg(QObject::tr("Scalable Vector Graphic"))); if (!filename.isEmpty()) { diff --git a/src/Mod/Image/Gui/Command.cpp b/src/Mod/Image/Gui/Command.cpp index ab09cee293..4aae6b9ff0 100644 --- a/src/Mod/Image/Gui/Command.cpp +++ b/src/Mod/Image/Gui/Command.cpp @@ -74,7 +74,7 @@ void CmdImageOpen::activated(int iMsg) str << ");;" << QObject::tr("All files") << " (*.*)"; // Reading an image QString s = QFileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Choose an image file to open"), - QString::null, formats); + QString(), formats); if (!s.isEmpty()) { try { s = Base::Tools::escapeEncodeFilename(s); @@ -122,7 +122,7 @@ void CmdCreateImagePlane::activated(int iMsg) str << ");;" << QObject::tr("All files") << " (*.*)"; // Reading an image QString s = QFileDialog::getOpenFileName(Gui::getMainWindow(), QObject::tr("Choose an image file to open"), - QString::null, formats); + QString(), formats); if (!s.isEmpty()) { QImage impQ(s); diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp index 45a4893bcd..8633ba2084 100644 --- a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp +++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp @@ -68,7 +68,7 @@ void DlgPartImportIgesImp::OnApply() void DlgPartImportIgesImp::onChooseFileName() { - QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString::null, QString::null, + QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString(), QString(), QString::fromLatin1("%1 (*.igs *.iges);;%2 (*.*)")) .arg(tr("IGES"), tr("All Files")); diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp index 5cda7cf700..c03e6eaab5 100644 --- a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp +++ b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp @@ -67,7 +67,7 @@ void DlgPartImportStepImp::OnApply() void DlgPartImportStepImp::onChooseFileName() { - QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString::null, QString::null, + QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString(), QString(), QString::fromLatin1("%1 (*.stp *.step);;%2 (*.*)")) .arg(tr("STEP"), tr("All Files")); diff --git a/src/Mod/Points/Gui/Command.cpp b/src/Mod/Points/Gui/Command.cpp index d18451730c..a0234b2d3b 100644 --- a/src/Mod/Points/Gui/Command.cpp +++ b/src/Mod/Points/Gui/Command.cpp @@ -77,7 +77,7 @@ void CmdPointsImport::activated(int iMsg) Q_UNUSED(iMsg); QString fn = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), - QString::null, QString(), QString::fromLatin1("%1 (*.asc *.pcd *.ply);;%2 (*.*)") + QString(), QString(), QString::fromLatin1("%1 (*.asc *.pcd *.ply);;%2 (*.*)") .arg(QObject::tr("Point formats"), QObject::tr("All Files"))); if (fn.isEmpty()) return; @@ -125,7 +125,7 @@ void CmdPointsExport::activated(int iMsg) std::vector points = getSelection().getObjectsOfType(Points::Feature::getClassTypeId()); for (std::vector::const_iterator it = points.begin(); it != points.end(); ++it) { QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), - QString::null, QString(), QString::fromLatin1("%1 (*.asc *.pcd *.ply);;%2 (*.*)") + QString(), QString(), QString::fromLatin1("%1 (*.asc *.pcd *.ply);;%2 (*.*)") .arg(QObject::tr("Point formats"), QObject::tr("All Files"))); if (fn.isEmpty()) break; diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp index fb6131fc1b..584f0ce2a8 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp @@ -168,7 +168,7 @@ class ColorPickerItem : public QFrame Q_OBJECT public: - ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString::null, + ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString(), QWidget *parent = 0); ~ColorPickerItem(); diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.h b/src/Mod/Spreadsheet/Gui/qtcolorpicker.h index c874297cda..892ec140b5 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.h +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.h @@ -84,7 +84,7 @@ public: ~QtColorPicker(); - void insertColor(const QColor &color, const QString &text = QString::null, int index = -1); + void insertColor(const QColor &color, const QString &text = QString(), int index = -1); QColor currentColor() const; diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index 7cd7822b85..bd98548f2c 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -1020,7 +1020,7 @@ void CmdTechDrawSymbol::activated(int iMsg) // Reading an image QString filename = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), - QObject::tr("Choose an SVG file to open"), QString::null, + QObject::tr("Choose an SVG file to open"), QString(), QString::fromLatin1("%1 (*.svg *.svgz);;%2 (*.*)"). arg(QObject::tr("Scalable Vector Graphic")). arg(QObject::tr("All Files"))); diff --git a/src/Mod/TechDraw/Gui/CommandDecorate.cpp b/src/Mod/TechDraw/Gui/CommandDecorate.cpp index 82e2b7036e..8e947a7077 100644 --- a/src/Mod/TechDraw/Gui/CommandDecorate.cpp +++ b/src/Mod/TechDraw/Gui/CommandDecorate.cpp @@ -412,7 +412,7 @@ void CmdTechDrawImage::activated(int iMsg) // Reading an image QString fileName = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(), QString::fromUtf8(QT_TR_NOOP("Select an Image File")), - QString::null, + QString(), QString::fromUtf8(QT_TR_NOOP("Image (*.png *.jpg *.jpeg)"))); if (!fileName.isEmpty()) diff --git a/src/Mod/Test/Gui/UnitTestImp.h b/src/Mod/Test/Gui/UnitTestImp.h index 731f5d1015..22ff52d2a1 100644 --- a/src/Mod/Test/Gui/UnitTestImp.h +++ b/src/Mod/Test/Gui/UnitTestImp.h @@ -45,7 +45,7 @@ public: void clearUnitTests(); QString getUnitTest() const; void setStatusText(const QString& text); - void setProgressFraction(float fraction, const QString& = QString::null); + void setProgressFraction(float fraction, const QString& = QString()); void clearErrorList(); void insertError(const QString& failure, const QString& details); void setRunCount(int);