summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-01-19 10:29:41 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-19 16:41:44 +0100
commit253c801c56bbe9fb221ee20e5b4df2368c90b365 (patch)
tree514cefdd1d8f3f1a08b7eeb02206c3591c97cb15 /src/corelib
parent8bbf1a46a56ce0f0047e24a57add63d503dd7457 (diff)
Remove QDir::convertSeparators()
This method has been deprecated since Qt 4.2. QDir::toNativeSeparators() replaces it since then. Change-Id: I49e6e1bfd50f26aa30134e599ee82067709549a7 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qdir.cpp12
-rw-r--r--src/corelib/io/qdir.h3
2 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index d6979bad57..7c5e8be3a2 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -772,18 +772,6 @@ QString QDir::relativeFilePath(const QString &fileName) const
return result;
}
-#ifndef QT_NO_DEPRECATED
-/*!
- \obsolete
-
- Use QDir::toNativeSeparators() instead.
-*/
-QString QDir::convertSeparators(const QString &pathName)
-{
- return toNativeSeparators(pathName);
-}
-#endif
-
/*!
\since 4.2
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index 5b058272e7..16226e0a71 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -131,9 +131,6 @@ public:
QString absoluteFilePath(const QString &fileName) const;
QString relativeFilePath(const QString &fileName) const;
-#ifdef QT_DEPRECATED
- QT_DEPRECATED static QString convertSeparators(const QString &pathName);
-#endif
static QString toNativeSeparators(const QString &pathName);
static QString fromNativeSeparators(const QString &pathName);