testlib: Remove unused QTestCoreElement and QTestElementAttribute types

The "documentation" has also been removed for all types, as it didn't
add anything, and maintaining it to be in sync with the values just
adds overhead.

Change-Id: Iab1dd7b9804c05559b4674342d6059b68ecf3ecf
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit f0757d2fcdf78e1c0573d8b8e1b3aca88dde6ad1)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

3 files changed, 23 insertions, 107 deletions

diff --git a/src/testlib/qtestcoreelement_p.h b/src/testlib/qtestcoreelement_p.h
index 458792a738..362a503126 100644
--- a/src/testlib/qtestcoreelement_p.h
+++ b/src/testlib/qtestcoreelement_p.h
@@ -138,7 +138,6 @@ const char *QTestCoreElement<ElementType>::elementName() const
         "error",
         "testcase",
         "testsuite",
-        "benchmark",
         "message",
         "system-err",
         "system-out",
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 8609de6d18..46882dc246 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -44,72 +44,6 @@
 
 QT_BEGIN_NAMESPACE
 
-/*! \enum QTest::AttributeIndex
-  This enum numbers the different tests.
-
-  \value AI_Undefined
-
-  \value AI_Name
-
-  \value AI_Result
-
-  \value AI_Tests
-
-  \value AI_Failures
-
-  \value AI_Errors
-
-  \value AI_Type
-
-  \value AI_Message
-
-  \value AI_PropertyValue
-
-  \value AI_QTestVersion
-
-  \value AI_QtVersion
-
-  \value AI_File
-
-  \value AI_Line
-
-  \value AI_Metric
-
-  \value AI_Tag
-
-  \value AI_Value
-
-  \value AI_Iterations
-
-  \value AI_Time
-
-  \value AI_Timestamp
-*/
-
-/*! \enum QTest::LogElementType
-  The enum specifies the kinds of test log messages.
-
-  \value LET_Undefined
-
-  \value LET_Property
-
-  \value LET_Properties
-
-  \value LET_Failure
-
-  \value LET_Message
-
-  \value LET_TestCase
-
-  \value LET_TestSuite
-
-  \value LET_Benchmark
-
-  \value LET_SystemError
-
-  \value LET_SystemOutput
-*/
-
 QTestElementAttribute::QTestElementAttribute() = default;
 
 QTestElementAttribute::~QTestElementAttribute()
@@ -127,21 +61,13 @@ const char *QTestElementAttribute::name() const
     const char *AttributeNames[] =
     {
         "name",
-        "result",
         "tests",
         "failures",
         "errors",
         "type",
         "message",
         "value",
-        "qtestversion",
-        "qtversion",
-        "file",
-        "line",
-        "metric",
-        "tag",
         "value",
-        "iterations",
         "time",
         "timestamp",
         "hostname",
diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h
index dd7d1c111a..70083f3ad5 100644
--- a/src/testlib/qtestelementattribute_p.h
+++ b/src/testlib/qtestelementattribute_p.h
@@ -61,43 +61,34 @@ namespace QTest {
     enum AttributeIndex
     {
         AI_Undefined = -1,
-        AI_Name = 0,
-        AI_Result = 1,
-        AI_Tests = 2,
-        AI_Failures = 3,
-        AI_Errors = 4,
-        AI_Type = 5,
-        AI_Message = 6,
-        AI_PropertyValue = 7,
-        AI_QTestVersion = 8,
-        AI_QtVersion = 9,
-        AI_File = 10,
-        AI_Line = 11,
-        AI_Metric = 12,
-        AI_Tag = 13,
-        AI_Value = 14,
-        AI_Iterations = 15,
-        AI_Time = 16,
-        AI_Timestamp = 17,
-        AI_Hostname = 18,
-        AI_Classname = 19,
-        AI_Skipped = 20
+        AI_Name,
+        AI_Tests,
+        AI_Failures,
+        AI_Errors,
+        AI_Type,
+        AI_Message,
+        AI_PropertyValue,
+        AI_Value,
+        AI_Time,
+        AI_Timestamp,
+        AI_Hostname,
+        AI_Classname,
+        AI_Skipped
     };
 
     enum LogElementType
     {
         LET_Undefined = -1,
-        LET_Property = 0,
-        LET_Properties = 1,
-        LET_Failure = 2,
-        LET_Error = 3,
-        LET_TestCase = 4,
-        LET_TestSuite = 5,
-        LET_Benchmark = 6,
-        LET_Text = 7,
-        LET_SystemError = 8,
-        LET_SystemOutput = 9,
-        LET_Skipped = 10
+        LET_Property,
+        LET_Properties,
+        LET_Failure,
+        LET_Error,
+        LET_TestCase,
+        LET_TestSuite,
+        LET_Text,
+        LET_SystemError,
+        LET_SystemOutput,
+        LET_Skipped
     };
 }