From ad9f5c7e938b1d80b455acdfd0809448f2b5e1db Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Tue, 9 Aug 2011 11:30:03 +0200 Subject: Remove all non-const operator== We had to leave the non-const operator== for binary compatibility. Remove them all, just leave the const version in there. 100% source compatible. Change-Id: Ib7a70fb441fe51d5164d9cbf495cbeda0f48fafe Reviewed-on: http://codereview.qt.nokia.com/2773 Reviewed-by: Qt Sanity Bot Reviewed-by: Robert Griebl --- src/corelib/io/qfileinfo.cpp | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'src/corelib/io/qfileinfo.cpp') diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index f54818e0a6..c83c39195a 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -366,7 +366,7 @@ QFileInfo::~QFileInfo() } /*! - \fn bool QFileInfo::operator!=(const QFileInfo &fileinfo) + \fn bool QFileInfo::operator!=(const QFileInfo &fileinfo) const Returns true if this QFileInfo object refers to a different file than the one specified by \a fileinfo; otherwise returns false. @@ -380,7 +380,19 @@ QFileInfo::~QFileInfo() */ /*! - \overload + Returns true if this QFileInfo object refers to a file in the same + location as \a fileinfo; otherwise returns false. + + Note that the result of comparing two empty QFileInfo objects, + containing no file references, is undefined. + + \warning This will not compare two different symbolic links + pointing to the same file. + + \warning Long and short file names that refer to the same file on Windows + are treated as if they referred to different files. + + \sa operator!=() */ bool QFileInfo::operator==(const QFileInfo &fileinfo) const { @@ -409,26 +421,6 @@ bool QFileInfo::operator==(const QFileInfo &fileinfo) const return canonicalFilePath().compare(fileinfo.canonicalFilePath(), sensitive) == 0; } -/*! - Returns true if this QFileInfo object refers to a file in the same - location as \a fileinfo; otherwise returns false. - - Note that the result of comparing two empty QFileInfo objects, - containing no file references, is undefined. - - \warning This will not compare two different symbolic links - pointing to the same file. - - \warning Long and short file names that refer to the same file on Windows - are treated as if they referred to different files. - - \sa operator!=() -*/ -bool QFileInfo::operator==(const QFileInfo &fileinfo) -{ - return const_cast(this)->operator==(fileinfo); -} - /*! Makes a copy of the given \a fileinfo and assigns it to this QFileInfo. */ -- cgit v1.2.3