kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Qt5: 'QString::null' is deprecated: use QString() [-Wdeprecated-declarations]

Browse Source
This commit is contained in:
wmayer
2020-06-08 12:24:55 +02:00
committed by wwmayer
parent ac7da8b39f
commit 7b72dcb062
20 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Drawing/Gui/Command.cpp
View File

@@ -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())
{

4
src/Mod/Image/Gui/Command.cpp
View File

@@ -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);

2
src/Mod/Part/Gui/DlgPartImportIgesImp.cpp
View File

@@ -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"));

2
src/Mod/Part/Gui/DlgPartImportStepImp.cpp
View File

@@ -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"));

4
src/Mod/Points/Gui/Command.cpp
View File

@@ -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<App::DocumentObject*> points = getSelection().getObjectsOfType(Points::Feature::getClassTypeId());
for (std::vector<App::DocumentObject*>::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;

2
src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp
View File

@@ -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();

2
src/Mod/Spreadsheet/Gui/qtcolorpicker.h
View File

@@ -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;

2
src/Mod/TechDraw/Gui/Command.cpp
View File

@@ -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")));

2
src/Mod/TechDraw/Gui/CommandDecorate.cpp
View File

@@ -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())

2
src/Mod/Test/Gui/UnitTestImp.h
View File

@@ -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);