Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 10:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make it obvious that defined Status before QSettings inclusion is bad

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2017-08-07 06:54:30 +00:00
parent 4f7a95ba56
commit 4697960c57
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/io/qsettings.h
View file

@ -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)
};