diff options
Diffstat (limited to 'src/corelib/io/qsettings.h')
| -rw-r--r-- | src/corelib/io/qsettings.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index edd59026ed..d78edd23a2 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -88,7 +88,7 @@ public: NativeFormat, IniFormat, -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) Registry32Format, Registry64Format, #endif @@ -125,13 +125,13 @@ public: #ifndef QT_NO_QOBJECT explicit QSettings(const QString &organization, - const QString &application = QString(), QObject *parent = Q_NULLPTR); + const QString &application = QString(), QObject *parent = nullptr); QSettings(Scope scope, const QString &organization, - const QString &application = QString(), QObject *parent = Q_NULLPTR); + const QString &application = QString(), QObject *parent = nullptr); QSettings(Format format, Scope scope, const QString &organization, - const QString &application = QString(), QObject *parent = Q_NULLPTR); - QSettings(const QString &fileName, Format format, QObject *parent = Q_NULLPTR); - explicit QSettings(QObject *parent = Q_NULLPTR); + const QString &application = QString(), QObject *parent = nullptr); + QSettings(const QString &fileName, Format format, QObject *parent = nullptr); + explicit QSettings(QObject *parent = nullptr); #else explicit QSettings(const QString &organization, const QString &application = QString()); @@ -146,6 +146,8 @@ public: void clear(); void sync(); Status status() const; + bool isAtomicSyncRequired() const; + void setAtomicSyncRequired(bool enable); void beginGroup(const QString &prefix); void endGroup(); @@ -197,7 +199,7 @@ public: protected: #ifndef QT_NO_QOBJECT - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; #endif private: |