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/qfile.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/qfile.h')
| -rw-r--r-- | src/corelib/io/qfile.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index e4a74859db..554b2954e1 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -87,9 +87,6 @@ public: ResizeError = 12, PermissionsError = 13, CopyError = 14 -#ifdef QT3_SUPPORT - , ConnectError = 30 -#endif }; enum Permission { @@ -186,14 +183,6 @@ public: virtual QAbstractFileEngine *fileEngine() const; -#ifdef QT3_SUPPORT - typedef Permission PermissionSpec; - inline QT3_SUPPORT QString name() const { return fileName(); } - inline QT3_SUPPORT void setName(const QString &aName) { setFileName(aName); } - inline QT3_SUPPORT bool open(OpenMode aFlags, FILE *f) { return open(f, aFlags); } - inline QT3_SUPPORT bool open(OpenMode aFlags, int fd) { return open(fd, aFlags); } -#endif - protected: #ifdef QT_NO_QOBJECT QFile(QFilePrivate &dd); |