remove redundant QT_NO_QOBJECT definition checks from qsettings_p header

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-24 05:14:42 +00:00
parent 1fc3be7d81
commit 3643bf444e

View file

@ -47,21 +47,13 @@
#include "qdatetime.h"
#include "qstringlist.h"
#ifndef QT_NO_QOBJECT
#include "qobject_p.h"
#endif
QT_BEGIN_NAMESPACE
class Q_AUTOTEST_EXPORT QSettingsPrivate
#ifndef QT_NO_QOBJECT
: public QObjectPrivate
#endif
{
#ifdef QT_NO_QOBJECT
QSettings *q_ptr;
#endif
Q_DECLARE_PUBLIC(QSettings)
public:
@ -71,14 +63,13 @@ public:
void read();
void write();
void notify();
// INI parser functions
static QString variantToString(const QVariant &v);
static QVariant stringToVariant(const QString &s);
static QStringList splitArgs(const QString &s, int idx);
void notify();
QSettings::Format format;
QSettings::Scope scope;
QSettings::SettingsStatus status;