From 5f91cb0d68e1e4a446f4ce79165eca50f52f47a9 Mon Sep 17 00:00:00 2001
From: Nikita Baryshnikov <nib952051@gmail.com>
Date: Fri, 24 Jul 2015 16:17:57 +0300
Subject: [PATCH] CppTools: fix metatype registration macro usage
in places where we do not need it
Change-Id: Ibf35f8144da859fffa3e0a7b6bb262284ec2292a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
src/plugins/cppeditor/cppincludehierarchy_test.cpp | 2 --
src/plugins/cppeditor/cppquickfix_test.cpp | 2 --
src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp | 1 -
src/plugins/cpptools/cpplocalsymbols_test.cpp | 1 -
src/plugins/cpptools/cpplocatorfilter_test.cpp | 2 --
src/plugins/cpptools/cppmodelmanager.cpp | 2 --
src/plugins/cpptools/cppmodelmanager_test.cpp | 2 +-
src/plugins/cpptools/functionutils.cpp | 2 --
src/plugins/cpptools/modelmanagertesthelper.cpp | 2 --
src/plugins/cpptools/symbolsearcher_test.cpp | 1 -
10 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/plugins/cppeditor/cppincludehierarchy_test.cpp b/src/plugins/cppeditor/cppincludehierarchy_test.cpp
index ffef3a8b35e..8bb29f4123e 100644
--- a/src/plugins/cppeditor/cppincludehierarchy_test.cpp
+++ b/src/plugins/cppeditor/cppincludehierarchy_test.cpp
@@ -35,8 +35,6 @@
#include <QList>
#include <QtTest>
-Q_DECLARE_METATYPE(QList<QByteArray>)
-
using namespace CPlusPlus;
using namespace CppTools;
diff --git a/src/plugins/cppeditor/cppquickfix_test.cpp b/src/plugins/cppeditor/cppquickfix_test.cpp
index b592d9f9da8..ddd2b5097d4 100644
--- a/src/plugins/cppeditor/cppquickfix_test.cpp
+++ b/src/plugins/cppeditor/cppquickfix_test.cpp
@@ -315,8 +315,6 @@ typedef QSharedPointer<CppQuickFixFactory> CppQuickFixFactoryPtr;
} // namespace CppEditor
-Q_DECLARE_METATYPE(CppEditor::CppQuickFixFactoryPtr)
-
namespace CppEditor {
namespace Internal {
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index c5bbf1f4499..b2e1c982949 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -89,7 +89,6 @@ public:
};
typedef QList<OverrideItem> OverrideItemList;
Q_DECLARE_METATYPE(OverrideItem)
-Q_DECLARE_METATYPE(OverrideItemList)
inline bool operator==(const OverrideItem &lhs, const OverrideItem &rhs)
{
diff --git a/src/plugins/cpptools/cpplocalsymbols_test.cpp b/src/plugins/cpptools/cpplocalsymbols_test.cpp
index 7fb8a921e20..9183c9bfcdd 100644
--- a/src/plugins/cpptools/cpplocalsymbols_test.cpp
+++ b/src/plugins/cpptools/cpplocalsymbols_test.cpp
@@ -115,7 +115,6 @@ struct Result
} // anonymous namespace
Q_DECLARE_METATYPE(Result)
-Q_DECLARE_METATYPE(QList<Result>)
QT_BEGIN_NAMESPACE
namespace QTest {
diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp
index b9b08f3d547..27258855d80 100644
--- a/src/plugins/cpptools/cpplocatorfilter_test.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp
@@ -48,8 +48,6 @@ using namespace CppTools::Internal;
using namespace ExtensionSystem;
using namespace Utils;
-Q_DECLARE_METATYPE(ILocatorFilter *)
-
namespace {
enum { debug = 0 };
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index cdf5922e424..13b582cfed0 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -67,8 +67,6 @@
#include <sstream>
#endif
-Q_DECLARE_METATYPE(QSet<QString>)
-
static const bool DumpProjectInfo = qgetenv("QTC_DUMP_PROJECT_INFO") == "1";
using namespace CppTools;
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index 23042216310..92bbebf91da 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -57,7 +57,7 @@ using namespace ProjectExplorer;
typedef CPlusPlus::Document Document;
-Q_DECLARE_METATYPE(QVector<ProjectFile>)
+Q_DECLARE_METATYPE(ProjectFile)
namespace {
diff --git a/src/plugins/cpptools/functionutils.cpp b/src/plugins/cpptools/functionutils.cpp
index dd26c80f25d..b8224923a06 100644
--- a/src/plugins/cpptools/functionutils.cpp
+++ b/src/plugins/cpptools/functionutils.cpp
@@ -175,8 +175,6 @@ typedef QList<Virtuality> VirtualityList;
} // CppTools namespace
Q_DECLARE_METATYPE(CppTools::Internal::Virtuality)
-Q_DECLARE_METATYPE(CppTools::Internal::VirtualityList)
-Q_DECLARE_METATYPE(QList<int>)
namespace CppTools {
namespace Internal {
diff --git a/src/plugins/cpptools/modelmanagertesthelper.cpp b/src/plugins/cpptools/modelmanagertesthelper.cpp
index 38573fcf07e..f347cd81af4 100644
--- a/src/plugins/cpptools/modelmanagertesthelper.cpp
+++ b/src/plugins/cpptools/modelmanagertesthelper.cpp
@@ -33,8 +33,6 @@
#include <cassert>
-Q_DECLARE_METATYPE(QSet<QString>)
-
using namespace CppTools::Internal;
using namespace CppTools::Tests;
diff --git a/src/plugins/cpptools/symbolsearcher_test.cpp b/src/plugins/cpptools/symbolsearcher_test.cpp
index 1eae1a9b9a7..dc71fa1562c 100644
--- a/src/plugins/cpptools/symbolsearcher_test.cpp
+++ b/src/plugins/cpptools/symbolsearcher_test.cpp
@@ -126,7 +126,6 @@ private:
} // anonymous namespace
Q_DECLARE_METATYPE(ResultData)
-Q_DECLARE_METATYPE(ResultDataList)
QT_BEGIN_NAMESPACE
namespace QTest {
--
GitLab