diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 10:11:49 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:48:52 +0200 |
commit | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (patch) | |
tree | f1643f829aedc9ac51fcc260f7df2639dfe08360 /src/corelib/io/qfileinfo.cpp | |
parent | 17f3451daa286b88a52f18c802d7b158dfb653b2 (diff) | |
parent | bdc417b3828737334723eae23097c85f70c23a33 (diff) |
Merge branch 'master' into refactor
Conflicts:
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qcursor_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa_p.h
src/gui/text/qtextcontrol.cpp
src/plugins/platforms/wayland/wayland.pro
src/widgets/accessible/qaccessible2.h
src/widgets/widgets/qwidgetlinecontrol_p.h
Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
Diffstat (limited to 'src/corelib/io/qfileinfo.cpp')
-rw-r--r-- | src/corelib/io/qfileinfo.cpp | 36 |
1 files changed, 14 insertions, 22 deletions
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 { @@ -410,26 +422,6 @@ bool QFileInfo::operator==(const QFileInfo &fileinfo) const } /*! - 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<const QFileInfo *>(this)->operator==(fileinfo); -} - -/*! Makes a copy of the given \a fileinfo and assigns it to this QFileInfo. */ QFileInfo &QFileInfo::operator=(const QFileInfo &fileinfo) |