1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileDialog: mark obsolete enum DontUseSheet as deprecated

Browse Source 
QFileDialog::DontUseSheet is obsolete since 4.5 and not used anywhere
inside the Qt code base. Mark it as deprecated and remove the last usage
in the examples.

Change-Id: If3d23fd5906314e6ebc7080efa79da14a2aa2720
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Christian Ehrlicher 2019-05-12 21:23:26 +02:00
parent 4f6eb43898
commit edb53d761e
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/widgets/dialogs/standarddialogs/dialog.cpp
View File

@ -287,7 +287,6 @@ Dialog::Dialog(QWidget *parent)
fileDialogOptionsWidget->addCheckBox(tr("Show directories only"), QFileDialog::ShowDirsOnly); fileDialogOptionsWidget->addCheckBox(tr("Show directories only"), QFileDialog::ShowDirsOnly);
fileDialogOptionsWidget->addCheckBox(tr("Do not resolve symlinks"), QFileDialog::DontResolveSymlinks); fileDialogOptionsWidget->addCheckBox(tr("Do not resolve symlinks"), QFileDialog::DontResolveSymlinks);
fileDialogOptionsWidget->addCheckBox(tr("Do not confirm overwrite"), QFileDialog::DontConfirmOverwrite); fileDialogOptionsWidget->addCheckBox(tr("Do not confirm overwrite"), QFileDialog::DontConfirmOverwrite);
fileDialogOptionsWidget->addCheckBox(tr("Do not use sheet"), QFileDialog::DontUseSheet);
fileDialogOptionsWidget->addCheckBox(tr("Readonly"), QFileDialog::ReadOnly); fileDialogOptionsWidget->addCheckBox(tr("Readonly"), QFileDialog::ReadOnly);
fileDialogOptionsWidget->addCheckBox(tr("Hide name filter details"), QFileDialog::HideNameFilterDetails); fileDialogOptionsWidget->addCheckBox(tr("Hide name filter details"), QFileDialog::HideNameFilterDetails);
fileDialogOptionsWidget->addCheckBox(tr("Do not use custom directory icons (Windows)"), QFileDialog::DontUseCustomDirectoryIcons); fileDialogOptionsWidget->addCheckBox(tr("Do not use custom directory icons (Windows)"), QFileDialog::DontUseCustomDirectoryIcons);

4
src/gui/kernel/qplatformdialoghelper.h
View File

@ -318,7 +318,9 @@ public:
ShowDirsOnly = 0x00000001, ShowDirsOnly = 0x00000001,
DontResolveSymlinks = 0x00000002, DontResolveSymlinks = 0x00000002,
DontConfirmOverwrite = 0x00000004, DontConfirmOverwrite = 0x00000004,
DontUseSheet = 0x00000008, #if QT_DEPRECATED_SINCE(5, 14)
DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x00000008,
#endif
DontUseNativeDialog = 0x00000010, DontUseNativeDialog = 0x00000010,
ReadOnly = 0x00000020, ReadOnly = 0x00000020,
HideNameFilterDetails = 0x00000040, HideNameFilterDetails = 0x00000040,

4
src/printsupport/dialogs/qabstractprintdialog.h
View File

@ -73,7 +73,9 @@ public:
PrintPageRange = 0x0004, PrintPageRange = 0x0004,
PrintShowPageSize = 0x0008, PrintShowPageSize = 0x0008,
PrintCollateCopies = 0x0010, PrintCollateCopies = 0x0010,
DontUseSheet = 0x0020, #if QT_DEPRECATED_SINCE(5, 14)
DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x0020,
#endif
PrintCurrentPage = 0x0040 PrintCurrentPage = 0x0040
}; };
Q_ENUM(PrintDialogOption) Q_ENUM(PrintDialogOption)

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

@ -92,7 +92,9 @@ public:
ShowDirsOnly = 0x00000001, ShowDirsOnly = 0x00000001,
DontResolveSymlinks = 0x00000002, DontResolveSymlinks = 0x00000002,
DontConfirmOverwrite = 0x00000004, DontConfirmOverwrite = 0x00000004,
DontUseSheet = 0x00000008, #if QT_DEPRECATED_SINCE(5, 14)
DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x00000008,
#endif
DontUseNativeDialog = 0x00000010, DontUseNativeDialog = 0x00000010,
ReadOnly = 0x00000020, ReadOnly = 0x00000020,
HideNameFilterDetails = 0x00000040, HideNameFilterDetails = 0x00000040,