whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtWidgets: mark QFileDialog functions as deprecated 

Mark some long obsolete functions as deprecated so the can be removed
with Qt6:
 - QFileDialog::setConfirmOverwrite()/confirmOverwrite()
 - QFileDialog::setReadOnly()/isReadOnly()

Change-Id: I3cc1df76c8e40e95b8e9893ae06ef488fad26fb6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Christian Ehrlicher 2019-02-10 19:37:03 +01:00
parent 652075d1e0
commit afc7b26313
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/dialogs/qfiledialog.cpp
View File

@ -1864,6 +1864,7 @@ QFileDialog::AcceptMode QFileDialog::acceptMode() const
return static_cast<AcceptMode>(d->options->acceptMode());
}
#if QT_DEPRECATED_SINCE(5, 13)
/*!
\property QFileDialog::readOnly
\obsolete
@ -1884,7 +1885,6 @@ bool QFileDialog::isReadOnly() const
return testOption(ReadOnly);
}
#if QT_DEPRECATED_SINCE(5, 13)
/*!
\property QFileDialog::resolveSymlinks
\obsolete
@ -1905,7 +1905,6 @@ bool QFileDialog::resolveSymlinks() const
{
return !testOption(DontResolveSymlinks);
}
#endif
/*!
\property QFileDialog::confirmOverwrite
@ -1925,6 +1924,7 @@ bool QFileDialog::confirmOverwrite() const
{
return !testOption(DontConfirmOverwrite);
}
#endif
/*!
\property QFileDialog::defaultSuffix

13
src/widgets/dialogs/qfiledialog.h
View File

@ -66,10 +66,10 @@ class Q_WIDGETS_EXPORT QFileDialog : public QDialog
Q_PROPERTY(ViewMode viewMode READ viewMode WRITE setViewMode)
Q_PROPERTY(FileMode fileMode READ fileMode WRITE setFileMode)
Q_PROPERTY(AcceptMode acceptMode READ acceptMode WRITE setAcceptMode)
Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE false)
Q_PROPERTY(bool confirmOverwrite READ confirmOverwrite WRITE setConfirmOverwrite DESIGNABLE false)
Q_PROPERTY(QString defaultSuffix READ defaultSuffix WRITE setDefaultSuffix)
#if QT_DEPRECATED_SINCE(5, 13)
Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE false)
Q_PROPERTY(bool confirmOverwrite READ confirmOverwrite WRITE setConfirmOverwrite DESIGNABLE false)
Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks DESIGNABLE false)
Q_PROPERTY(bool nameFilterDetailsVisible READ isNameFilterDetailsVisible
WRITE setNameFilterDetailsVisible DESIGNABLE false)
@ -80,7 +80,8 @@ class Q_WIDGETS_EXPORT QFileDialog : public QDialog
public:
enum ViewMode { Detail, List };
Q_ENUM(ViewMode)
enum FileMode { AnyFile, ExistingFile, Directory, ExistingFiles, DirectoryOnly };
enum FileMode { AnyFile, ExistingFile, Directory, ExistingFiles,
DirectoryOnly Q_DECL_ENUMERATOR_DEPRECATED_X("Use setOption(ShowDirsOnly, true) instead")};
Q_ENUM(FileMode)
enum AcceptMode { AcceptOpen, AcceptSave };
Q_ENUM(AcceptMode)
@ -153,10 +154,10 @@ public:
void setAcceptMode(AcceptMode mode);
AcceptMode acceptMode() const;
#if QT_DEPRECATED_SINCE(5, 13)
void setReadOnly(bool enabled);
bool isReadOnly() const;
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use setOption(DontResolveSymlinks, !enabled) instead")
void setResolveSymlinks(bool enabled);
QT_DEPRECATED_X("Use !testOption(DontResolveSymlinks) instead")
@ -169,8 +170,12 @@ public:
QByteArray saveState() const;
bool restoreState(const QByteArray &state);
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use setOption(DontConfirmOverwrite, !enabled) instead")
void setConfirmOverwrite(bool enabled);
QT_DEPRECATED_X("Use !testOption(DontConfirmOverwrite) instead")
bool confirmOverwrite() const;
#endif
void setDefaultSuffix(const QString &suffix);
QString defaultSuffix() const;

24
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
View File

@ -620,13 +620,13 @@ void tst_QFiledialog::acceptMode()
void tst_QFiledialog::confirmOverwrite()
{
QFileDialog fd;
QCOMPARE(fd.confirmOverwrite(), true);
fd.setConfirmOverwrite(true);
QCOMPARE(fd.confirmOverwrite(), true);
fd.setConfirmOverwrite(false);
QCOMPARE(fd.confirmOverwrite(), false);
fd.setConfirmOverwrite(true);
QCOMPARE(fd.confirmOverwrite(), true);
QCOMPARE(fd.testOption(QFileDialog::DontConfirmOverwrite), false);
fd.setOption(QFileDialog::DontConfirmOverwrite, false);
QCOMPARE(fd.testOption(QFileDialog::DontConfirmOverwrite), false);
fd.setOption(QFileDialog::DontConfirmOverwrite, true);
QCOMPARE(fd.testOption(QFileDialog::DontConfirmOverwrite), true);
fd.setOption(QFileDialog::DontConfirmOverwrite, false);
QCOMPARE(fd.testOption(QFileDialog::DontConfirmOverwrite), false);
}
void tst_QFiledialog::defaultSuffix()
@ -808,8 +808,8 @@ void tst_QFiledialog::isReadOnly()
//QCOMPARE(renameAction && renameAction->isEnabled(), true);
//QCOMPARE(deleteAction && deleteAction->isEnabled(), true);
fd.setReadOnly(true);
QCOMPARE(fd.isReadOnly(), true);
fd.setOption(QFileDialog::ReadOnly, true);
QCOMPARE(fd.testOption(QFileDialog::ReadOnly), true);
QCOMPARE(newButton && newButton->isEnabled(), false);
QCOMPARE(renameAction && renameAction->isEnabled(), false);
@ -853,11 +853,11 @@ void tst_QFiledialog::resolveSymlinks()
QFileDialog fd;
// default
QCOMPARE(fd.resolveSymlinks(), true);
QCOMPARE(fd.testOption(QFileDialog::DontResolveSymlinks), false);
fd.setOption(QFileDialog::DontResolveSymlinks, true);
QCOMPARE(fd.resolveSymlinks(), false);
QCOMPARE(fd.testOption(QFileDialog::DontResolveSymlinks), true);
fd.setOption(QFileDialog::DontResolveSymlinks, false);
QCOMPARE(fd.resolveSymlinks(), true);
QCOMPARE(fd.testOption(QFileDialog::DontResolveSymlinks), false);
// the file dialog doesn't do anything based upon this, just passes it to the model
// the model should fully test it, don't test it here