From 253c801c56bbe9fb221ee20e5b4df2368c90b365 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 19 Jan 2012 10:29:41 +0100 Subject: Remove QDir::convertSeparators() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This method has been deprecated since Qt 4.2. QDir::toNativeSeparators() replaces it since then. Change-Id: I49e6e1bfd50f26aa30134e599ee82067709549a7 Reviewed-by: Robin Burchell Reviewed-by: João Abecasis --- src/corelib/io/qdir.cpp | 12 ------------ src/corelib/io/qdir.h | 3 --- 2 files changed, 15 deletions(-) (limited to 'src/corelib/io') 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); -- cgit v1.2.3