summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-01-24 22:26:31 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-31 16:17:55 +0100
commit3855233dab82946ba50ddd90ce86df035998da8e (patch)
tree908cdc84626a17dde6450810f97859502dcddab3 /src/widgets/dialogs
parent9a4d30d9995a806ca7c69692992383b28c655054 (diff)
Remove many deprecated methods
Remove methods that have been marked as deprecated before Qt 4.6. Keep others, but inline them where possible and mark them as QT_DEPRECATED_SINCE(5, 0). Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp57
-rw-r--r--src/widgets/dialogs/qfiledialog.h7
2 files changed, 3 insertions, 61 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 0d5bb68dda..da734c80f0 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -1097,15 +1097,6 @@ void QFileDialog::setNameFilter(const QString &filter)
setNameFilters(qt_make_filter_list(filter));
}
-/*!
- \obsolete
-
- Use setNameFilter() instead.
-*/
-void QFileDialog::setFilter(const QString &filter)
-{
- setNameFilter(filter);
-}
/*!
\property QFileDialog::nameFilterDetailsVisible
@@ -1178,16 +1169,6 @@ void QFileDialog::setNameFilters(const QStringList &filters)
}
/*!
- \obsolete
-
- Use setNameFilters() instead.
-*/
-void QFileDialog::setFilters(const QStringList &filters)
-{
- setNameFilters(filters);
-}
-
-/*!
\since 4.4
Returns the file type filters that are in operation on this file
@@ -1199,17 +1180,6 @@ QStringList QFileDialog::nameFilters() const
}
/*!
- \obsolete
-
- Use nameFilters() instead.
-*/
-
-QStringList QFileDialog::filters() const
-{
- return nameFilters();
-}
-
-/*!
\since 4.4
Sets the current file type \a filter. Multiple filters can be
@@ -1237,17 +1207,6 @@ void QFileDialog::selectNameFilter(const QString &filter)
}
/*!
- \obsolete
-
- Use selectNameFilter() instead.
-*/
-
-void QFileDialog::selectFilter(const QString &filter)
-{
- selectNameFilter(filter);
-}
-
-/*!
\since 4.4
Returns the filter that the user selected in the file dialog.
@@ -1264,16 +1223,6 @@ QString QFileDialog::selectedNameFilter() const
}
/*!
- \obsolete
-
- Use selectedNameFilter() instead.
-*/
-QString QFileDialog::selectedFilter() const
-{
- return selectedNameFilter();
-}
-
-/*!
\since 4.4
Returns the filter that is used when displaying files.
@@ -1799,7 +1748,7 @@ QString QFileDialog::getOpenFileName(QWidget *parent,
dialog.selectNameFilter(*selectedFilter);
if (dialog.exec() == QDialog::Accepted) {
if (selectedFilter)
- *selectedFilter = dialog.selectedFilter();
+ *selectedFilter = dialog.selectedNameFilter();
return dialog.selectedFiles().value(0);
}
return QString();
@@ -1884,7 +1833,7 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent,
dialog.selectNameFilter(*selectedFilter);
if (dialog.exec() == QDialog::Accepted) {
if (selectedFilter)
- *selectedFilter = dialog.selectedFilter();
+ *selectedFilter = dialog.selectedNameFilter();
return dialog.selectedFiles();
}
return QStringList();
@@ -1971,7 +1920,7 @@ QString QFileDialog::getSaveFileName(QWidget *parent,
dialog.selectNameFilter(*selectedFilter);
if (dialog.exec() == QDialog::Accepted) {
if (selectedFilter)
- *selectedFilter = dialog.selectedFilter();
+ *selectedFilter = dialog.selectedNameFilter();
return dialog.selectedFiles().value(0);
}
diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 1bfbd64023..c5298b1227 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -110,13 +110,6 @@ public:
void selectFile(const QString &filename);
QStringList selectedFiles() const;
-#ifdef QT_DEPRECATED
- QT_DEPRECATED void setFilter(const QString &filter);
- QT_DEPRECATED void setFilters(const QStringList &filters);
- QT_DEPRECATED QStringList filters() const;
- QT_DEPRECATED void selectFilter(const QString &filter);
- QT_DEPRECATED QString selectedFilter() const;
-#endif
void setNameFilterDetailsVisible(bool enabled);
bool isNameFilterDetailsVisible() const;