diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-28 23:33:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-29 15:10:14 +0200 |
| commit | 6fa1bbdce09bbbee2ea50b9360c821e54c81be51 (patch) | |
| tree | 98796b534428c36023bf107b1c0b1e49ae75f755 /src/corelib/io/qfileinfo.h | |
| parent | 369696dc231450c774a5cc253d061aad2f3b6a19 (diff) | |
remove QT3_SUPPORT in corelib/io
Change-Id: Ia9ad0bebacc538a7392afb0fdcca40e8a2bb687b
Reviewed-on: http://codereview.qt.nokia.com/865
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
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 |