diff options
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpainterpath.cpp | 3 | ||||
| -rw-r--r-- | src/gui/painting/qrgba64.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmainwindowlayout_p.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 49a05c48dd..6a473b3836 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3576,7 +3576,7 @@ void QGuiApplicationPrivate::_q_updateFocusObject(QObject *object) emit q->focusObjectChanged(object); } -enum { +enum MouseMasks { MouseCapsMask = 0xFF, MouseSourceMaskDst = 0xFF00, MouseSourceMaskSrc = MouseCapsMask, diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 48010c0a71..558ab81847 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -1856,6 +1856,8 @@ bool QPainterPath::contains(const QPointF &pt) const : ((winding_number % 2) != 0)); } +enum PainterDirections { Left, Right, Top, Bottom }; + static bool qt_painterpath_isect_line_rect(qreal x1, qreal y1, qreal x2, qreal y2, const QRectF &rect) { @@ -1864,7 +1866,6 @@ static bool qt_painterpath_isect_line_rect(qreal x1, qreal y1, qreal x2, qreal y qreal top = rect.top(); qreal bottom = rect.bottom(); - enum { Left, Right, Top, Bottom }; // clip the lines, after cohen-sutherland, see e.g. http://www.nondot.org/~sabre/graphpro/line6.html int p1 = ((x1 < left) << Left) | ((x1 > right) << Right) diff --git a/src/gui/painting/qrgba64.h b/src/gui/painting/qrgba64.h index fab9506ff2..51b37b2ef4 100644 --- a/src/gui/painting/qrgba64.h +++ b/src/gui/painting/qrgba64.h @@ -44,7 +44,7 @@ class QRgba64 { // Make sure that the representation always has the order: red green blue alpha, independent // of byte order. This way, vector operations that assume 4 16-bit values see the correct ones. - enum { + enum Shifts { #if Q_BYTE_ORDER == Q_BIG_ENDIAN RedShift = 48, GreenShift = 32, diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index 0695c2eff4..113e1d89d4 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -511,7 +511,7 @@ static const quint8 requiredUnicodeBits[QFontDatabase::WritingSystemsCount][2] = { 14, 127 }, // Nko }; -enum { +enum CsbBits { Latin1CsbBit = 0, CentralEuropeCsbBit = 1, TurkishCsbBit = 4, diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index a7f2f17bdf..b718a0ca4f 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -263,7 +263,7 @@ public: // save/restore - enum { // sentinel values used to validate state data + enum VersionMarkers { // sentinel values used to validate state data VersionMarker = 0xff }; void saveState(QDataStream &stream) const; |