make it obvious that defined Status before QSettings inclusion is bad

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

diff --git a/src/core/io/qsettings.h b/src/core/io/qsettings.h
index b17d405..2844dd6 100644 (file)
--- a/src/core/io/qsettings.h
+++ b/src/core/io/qsettings.h
@@ -46,18 +46,14 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
 #ifndef QT_NO_SETTINGS
 
-
 #include <ctype.h>
 
 QT_BEGIN_NAMESPACE
 
-#ifdef Status // we seem to pick up a macro Status --> int somewhere
-#undef Status
+#ifdef Status
+#error qsettings.h must be included before any header file that defines Status
 #endif
 
 class QIODevice;
@@ -183,14 +179,12 @@ public:
     static Format registerFormat(const QString &extension, ReadFunc readFunc, WriteFunc writeFunc,
                                  Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive);
 
-
 protected:
 #ifndef QT_NO_QOBJECT
     bool event(QEvent *event);
 #endif
 
 private:
-
     Q_DISABLE_COPY(QSettings)
 };