summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-01-28 20:17:16 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-12 22:46:38 +0100
commit9253509f3eebdcfc9669dd15caf9c7ec01f15dc7 (patch)
tree03ca048560046ee3e11ed75935c5e095a67527f4 /src
parentd52b5d37e2849369b1e9ab2d32e9290e22db0ef4 (diff)
Mark public non-member non-static variables as Q_DECL_UNUSED
This avoids warnings in compilers that check for unused variables. They can't tell that the the variable came from a header. Change-Id: I1ea5e5bbc76d676fbb561bdc8ae6543e758de90e Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qrgb.h3
-rw-r--r--src/widgets/kernel/qlayoutitem.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/painting/qrgb.h b/src/gui/painting/qrgb.h
index 834ebec5a9..d7a01840e8 100644
--- a/src/gui/painting/qrgb.h
+++ b/src/gui/painting/qrgb.h
@@ -49,7 +49,8 @@ QT_BEGIN_NAMESPACE
typedef unsigned int QRgb; // RGB triplet
-const QRgb RGB_MASK = 0x00ffffff; // masks RGB values
+// non-namespaced Qt global variable
+const Q_DECL_UNUSED QRgb RGB_MASK = 0x00ffffff; // masks RGB values
inline int qRed(QRgb rgb) // get red part of RGB
{ return ((rgb >> 16) & 0xff); }
diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h
index 3dfd5b0eb2..808cc9ff5d 100644
--- a/src/widgets/kernel/qlayoutitem.h
+++ b/src/widgets/kernel/qlayoutitem.h
@@ -50,7 +50,7 @@
QT_BEGIN_NAMESPACE
-static const int QLAYOUTSIZE_MAX = INT_MAX/256/16;
+static const Q_DECL_UNUSED int QLAYOUTSIZE_MAX = INT_MAX/256/16;
class QLayout;
class QLayoutItem;