diff options
| -rw-r--r-- | src/corelib/io/qsavefile.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/io/qsavefile.h | 4 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/corelib/io/qsavefile.cpp b/src/corelib/io/qsavefile.cpp index a7d101dc124..a5108710614 100644 --- a/src/corelib/io/qsavefile.cpp +++ b/src/corelib/io/qsavefile.cpp @@ -71,14 +71,6 @@ QSaveFilePrivate::~QSaveFilePrivate() \sa QTextStream, QDataStream, QFileInfo, QDir, QFile, QTemporaryFile */ -#ifdef QT_NO_QOBJECT -QSaveFile::QSaveFile(const QString &name) - : QFileDevice(*new QSaveFilePrivate) -{ - Q_D(QSaveFile); - d->fileName = name; -} -#else /*! Constructs a new file object to represent the file with the given \a name. */ @@ -97,6 +89,7 @@ QSaveFile::QSaveFile(QObject *parent) : QFileDevice(*new QSaveFilePrivate, parent) { } + /*! Constructs a new file object with the given \a parent to represent the file with the specified \a name. @@ -107,7 +100,6 @@ QSaveFile::QSaveFile(const QString &name, QObject *parent) Q_D(QSaveFile); d->fileName = name; } -#endif /*! Destroys the file object, discarding the saved contents unless commit() was called. @@ -417,8 +409,6 @@ bool QSaveFile::directWriteFallback() const QT_END_NAMESPACE -#ifndef QT_NO_QOBJECT #include "moc_qsavefile.cpp" -#endif #endif // QT_CONFIG(temporaryfile) diff --git a/src/corelib/io/qsavefile.h b/src/corelib/io/qsavefile.h index 5e8cffe7c38..cc35901f75c 100644 --- a/src/corelib/io/qsavefile.h +++ b/src/corelib/io/qsavefile.h @@ -23,18 +23,14 @@ class QSaveFilePrivate; class Q_CORE_EXPORT QSaveFile : public QFileDevice { -#ifndef QT_NO_QOBJECT Q_OBJECT -#endif Q_DECLARE_PRIVATE(QSaveFile) public: explicit QSaveFile(const QString &name); -#ifndef QT_NO_QOBJECT explicit QSaveFile(QObject *parent = nullptr); explicit QSaveFile(const QString &name, QObject *parent); -#endif ~QSaveFile(); QString fileName() const override; |