From: Ivailo Monev <xakepa10@laimg.moc>
Date: Tue, 24 Dec 2019 05:14:42 +0000 (+0000)
Subject: remove redundant QT_NO_QOBJECT definition checks from qsettings_p header
X-Git-Tag: 4.12.0~4583
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3643bf444e5b9373e17e445e05576fd0a73d854e;p=kde%2FKatie.git

remove redundant QT_NO_QOBJECT definition checks from qsettings_p header

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/core/io/qsettings_p.h b/src/core/io/qsettings_p.h
index 2b4f8f7b6..b1e7090b8 100644
--- a/src/core/io/qsettings_p.h
+++ b/src/core/io/qsettings_p.h
@@ -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;