From 08d1706be3f4ee699999f846c16ab33f0825ad44 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 20 Jan 2017 15:05:47 +0100
Subject: [PATCH] Tests: Fix Clang warnings about various unused variables

tst_qpainter.cpp:400:26: warning: unused variable 'maskSource_data' [-Wunused-const-variable]
tst_qpainter.cpp:422:26: warning: unused variable 'maskResult_data' [-Wunused-const-variable]
tst_qfuture.cpp:1203:11: warning: unused variable 'resultCount' [-Wunused-const-variable]
tst_qvarlengtharray.cpp:33:11: warning: unused variable 'N' [-Wunused-const-variable]

Change-Id: Ic8891603089a877a5c69701c63c2c6fd20fa6a22
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 .../corelib/thread/qfuture/tst_qfuture.cpp    |  2 -
 .../qvarlengtharray/tst_qvarlengtharray.cpp   |  2 -
 tests/auto/gui/image/qicon/tst_qicon.cpp      | 10 -----
 .../gui/painting/qpainter/tst_qpainter.cpp    | 45 -------------------
 4 files changed, 59 deletions(-)

diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
index b8841bb6a3..5f67ffedd1 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -1200,8 +1200,6 @@ void tst_QFuture::pause()
     Interface.reportFinished();
 }
 
-const int resultCount = 1000;
-
 class ResultObject : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
index 7fc44343a5..280305ddd8 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -30,8 +30,6 @@
 #include <qvarlengtharray.h>
 #include <qvariant.h>
 
-const int N = 1;
-
 class tst_QVarLengthArray : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 4218d0751f..01f3eabb17 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -530,16 +530,6 @@ void tst_QIcon::streamAvailableSizes()
     }
 }
 
-
-static inline bool operator<(const QSize &lhs, const QSize &rhs)
-{
-    if (lhs.width() < rhs.width())
-        return true;
-    else if (lhs.width() == lhs.width())
-        return lhs.height() < lhs.height();
-    return false;
-}
-
 #ifndef QT_NO_WIDGETS
 void tst_QIcon::task184901_badCache()
 {
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 3562bc63f4..7f72fb04f2 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -397,51 +397,6 @@ void tst_QPainter::cleanupTestCase()
     QFile::remove(QLatin1String("foo.png"));
 }
 
-static const char* const maskSource_data[] = {
-"16 13 6 1",
-". c None",
-"d c #000000",
-"# c #999999",
-"c c #cccccc",
-"b c #ffff00",
-"a c #ffffff",
-"...#####........",
-"..#aaaaa#.......",
-".#abcbcba######.",
-".#acbcbcaaaaaa#d",
-".#abcbcbcbcbcb#d",
-"#############b#d",
-"#aaaaaaaaaa##c#d",
-"#abcbcbcbcbbd##d",
-".#abcbcbcbcbcd#d",
-".#acbcbcbcbcbd#d",
-"..#acbcbcbcbb#dd",
-"..#############d",
-"...ddddddddddddd"};
-
-static const char* const maskResult_data[] = {
-"16 13 6 1",
-". c #ff0000",
-"d c #000000",
-"# c #999999",
-"c c #cccccc",
-"b c #ffff00",
-"a c #ffffff",
-"...#####........",
-"..#aaaaa#.......",
-".#abcbcba######.",
-".#acbcbcaaaaaa#d",
-".#abcbcbcbcbcb#d",
-"#############b#d",
-"#aaaaaaaaaa##c#d",
-"#abcbcbcbcbbd##d",
-".#abcbcbcbcbcd#d",
-".#acbcbcbcbcbd#d",
-"..#acbcbcbcbb#dd",
-"..#############d",
-"...ddddddddddddd"};
-
-
 #ifndef QT_NO_WIDGETS
 void tst_QPainter::drawPixmap_comp_data()
 {