replaced QPair with std::pair (danmar#7329)

it is just an alias

Author: firewave

gui/CMakeLists.txt

@@ -9,6 +9,7 @@ CheckOptions:
   - { key: HeaderFileExtensions,          value: 'x' }
 ")
 
+    # TODO: limit to target
     add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
     add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
     add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
@@ -77,6 +78,7 @@ CheckOptions:
         # caused by Qt generated moc code
         target_compile_options_safe(cppcheck-gui -Wno-redundant-parens)
     endif()
+    #target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR)  # TODO: cannot be completely disabled because QBrush uses QPair
 
     if (QHELPGENERATOR)
         # TODO: generate in CMAKE_BINARY_DIR folder

gui/cppchecklibrarydata.cpp

@@ -22,6 +22,7 @@
 
 #include <stdexcept>
 #include <string>
+#include <utility>
 
 #include <QObject>
 #include <QVariant>
@@ -147,7 +148,7 @@ static CppcheckLibraryData::TypeChecks loadTypeChecks(QXmlStreamReader &xmlReade
             continue;
         const QString elementName = xmlReader.name().toString();
         if (elementName == "suppress" || elementName == "check") {
-            QPair<QString, QString> entry(elementName, xmlReader.readElementText());
+            std::pair<QString, QString> entry(elementName, xmlReader.readElementText());
             typeChecks.append(entry);
         }
     }
@@ -756,7 +757,7 @@ static void writeTypeChecks(QXmlStreamWriter &xmlWriter, const CppcheckLibraryDa
     if (!typeChecks.isEmpty()) {
         xmlWriter.writeStartElement("unusedvar");
     }
-    for (const QPair<QString, QString> &check : typeChecks) {
+    for (const std::pair<QString, QString> &check : typeChecks) {
         xmlWriter.writeStartElement(check.first);
         xmlWriter.writeCharacters(check.second);
         xmlWriter.writeEndElement();

gui/cppchecklibrarydata.h

@@ -22,10 +22,10 @@
 #include "config.h"
 
 #include <cstdint>
+#include <utility>
 
 #include <QList>
 #include <QMap>
-#include <QPair>
 #include <QString>
 #include <QStringList>
 
@@ -171,7 +171,7 @@ class CppcheckLibraryData {
         QStringList platforms;  // Keeps "type" attribute of each "platform" element
     };
 
-    using TypeChecks = QList<QPair<QString, QString>>;
+    using TypeChecks = QList<std::pair<QString, QString>>;
 
     struct Reflection {
         struct Call {

gui/mainwindow.h

@@ -27,7 +27,6 @@
 #include <QFileDialog>
 #include <QMainWindow>
 #include <QObject>
-#include <QPair>
 #include <QString>
 #include <QStringList>
 

gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp

@@ -23,7 +23,6 @@
 #include <QFile>
 #include <QIODevice>
 #include <QList>
-#include <QPair>
 #include <QStringList>
 #include <QTextStream>
 #include <QtTest>

tools/triage/CMakeLists.txt

@@ -8,6 +8,7 @@ CheckOptions:
   - { key: HeaderFileExtensions,          value: 'x' }
 ")
 
+    # TODO: limit to target
     add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
     add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
     add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
@@ -36,4 +37,5 @@ CheckOptions:
         # caused by Qt generated moc code
         target_compile_options_safe(triage -Wno-redundant-parens)
     endif()
+    #target_compile_definitions(triage PRIVATE -DQT_NO_QPAIR)  # TODO: cannot be completely disabled because QBrush uses QPair
 endif()