diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /src/corelib/io/qfileinfo.h | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'src/corelib/io/qfileinfo.h')
| -rw-r--r-- | src/corelib/io/qfileinfo.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 5b1b48b7d5..6ca0ae79e0 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -139,40 +139,6 @@ public: bool caching() const; void setCaching(bool on); -#ifdef QT3_SUPPORT - enum Permission { - ReadOwner = QFile::ReadOwner, WriteOwner = QFile::WriteOwner, ExeOwner = QFile::ExeOwner, - ReadUser = QFile::ReadUser, WriteUser = QFile::WriteUser, ExeUser = QFile::ExeUser, - ReadGroup = QFile::ReadGroup, WriteGroup = QFile::WriteGroup, ExeGroup = QFile::ExeGroup, - ReadOther = QFile::ReadOther, WriteOther = QFile::WriteOther, ExeOther = QFile::ExeOther - }; - Q_DECLARE_FLAGS(PermissionSpec, Permission) - - inline QT3_SUPPORT QString baseName(bool complete) { - if(complete) - return completeBaseName(); - return baseName(); - } - inline QT3_SUPPORT QString extension(bool complete = true) const { - if(complete) - return completeSuffix(); - return suffix(); - } - inline QT3_SUPPORT QString absFilePath() const { return absoluteFilePath(); } - - inline QT3_SUPPORT QString dirPath(bool absPath = false) const { - if(absPath) - return absolutePath(); - return path(); - } - QT3_SUPPORT QDir dir(bool absPath) const; - inline QT3_SUPPORT bool convertToAbs() { return makeAbsolute(); } -#if !defined(Q_NO_TYPESAFE_FLAGS) - inline QT3_SUPPORT bool permission(PermissionSpec permissions) const - { return permission(QFile::Permissions(static_cast<int>(permissions))); } -#endif -#endif - protected: QSharedDataPointer<QFileInfoPrivate> d_ptr; private: @@ -190,14 +156,7 @@ private: Q_DECLARE_TYPEINFO(QFileInfo, Q_MOVABLE_TYPE); -#ifdef QT3_SUPPORT -Q_DECLARE_OPERATORS_FOR_FLAGS(QFileInfo::PermissionSpec) -#endif - typedef QList<QFileInfo> QFileInfoList; -#ifdef QT3_SUPPORT -typedef QList<QFileInfo>::Iterator QFileInfoListIterator; -#endif QT_END_NAMESPACE |