From 9eda09f511246720a8c4eff2bbb52bbfacc36f48 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 21 Jan 2016 16:56:08 -0800
Subject: Uppercase the verbosity setting enums.

Change-Id: I7a9e11d7b64a4cc78e24ffff142b9996fd77cb10
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
 src/corelib/io/qdebug.cpp |  2 +-
 src/corelib/io/qdebug.h   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/corelib/io')

diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index d107b7ec33..ffa7867d18 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -357,7 +357,7 @@ QDebug &QDebug::resetFormat()
     stream->space = true;
     if (stream->context.version > 1)
         stream->flags = 0;
-    stream->setVerbosity(Stream::defaultVerbosity);
+    stream->setVerbosity(Stream::DefaultVerbosity);
     return *this;
 }
 
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index 6a476de594..5087e3b532 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -66,14 +66,14 @@ class Q_CORE_EXPORT QDebug
     friend class QMessageLogger;
     friend class QDebugStateSaverPrivate;
     struct Stream {
-        enum { defaultVerbosity = 2, verbosityShift = 29, verbosityMask = 0x7 };
+        enum { DefaultVerbosity = 2, VerbosityShift = 29, VerbosityMask = 0x7 };
 
         Stream(QIODevice *device) : ts(device), ref(1), type(QtDebugMsg),
-            space(true), message_output(false), flags(defaultVerbosity << verbosityShift) {}
+            space(true), message_output(false), flags(DefaultVerbosity << VerbosityShift) {}
         Stream(QString *string) : ts(string, QIODevice::WriteOnly), ref(1), type(QtDebugMsg),
-            space(true), message_output(false), flags(defaultVerbosity << verbosityShift) {}
+            space(true), message_output(false), flags(DefaultVerbosity << VerbosityShift) {}
         Stream(QtMsgType t) : ts(&buffer, QIODevice::WriteOnly), ref(1), type(t),
-            space(true), message_output(true), flags(defaultVerbosity << verbosityShift) {}
+            space(true), message_output(true), flags(DefaultVerbosity << VerbosityShift) {}
         QTextStream ts;
         QString buffer;
         int ref;
@@ -91,12 +91,12 @@ class Q_CORE_EXPORT QDebug
         void setFlag(FormatFlag flag) { if (context.version > 1) { flags |= flag; } }
         void unsetFlag(FormatFlag flag) { if (context.version > 1) { flags &= ~flag; } }
         int verbosity() const
-        { return context.version > 1 ? (flags >> verbosityShift) & verbosityMask : int(Stream::defaultVerbosity); }
+        { return context.version > 1 ? (flags >> VerbosityShift) & VerbosityMask : int(Stream::DefaultVerbosity); }
         void setVerbosity(int v)
         {
             if (context.version > 1) {
-                flags &= ~(verbosityMask << verbosityShift);
-                flags |= (v & verbosityMask) << verbosityShift;
+                flags &= ~(VerbosityMask << VerbosityShift);
+                flags |= (v & VerbosityMask) << VerbosityShift;
             }
         }
         // added in 5.4
-- 
cgit v1.2.3