Commit b34b019c authored by Nikita Baryshnikov's avatar Nikita Baryshnikov

ProjectExplorer: Remove metatype registration macro usage

in places where we do not need it. Also removed metatypedeclarations.h

Change-Id: I406891ff9b87e88112ae6317c479f5fab83625c8
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent e307b7ee
......@@ -153,4 +153,3 @@ signals:
} // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::BuildConfiguration *)
......@@ -79,4 +79,3 @@ private:
} // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::BuildStepList *)
......@@ -127,7 +127,6 @@ void ClangParser::stdError(const QString &line)
# include <QTest>
# include "projectexplorer.h"
# include "metatypedeclarations.h"
# include "outputparser_test.h"
void ProjectExplorerPlugin::testClangOutputParser_data()
......
......@@ -178,7 +178,6 @@ bool CustomParser::parseLine(const QString &rawLine, CustomParserExpression::Cus
# include <QTest>
# include "projectexplorer.h"
# include "metatypedeclarations.h"
# include "outputparser_test.h"
void ProjectExplorerPlugin::testCustomOutputParsers_data()
......
......@@ -131,4 +131,3 @@ private:
} // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::DeployConfiguration *)
......@@ -186,7 +186,6 @@ void GccParser::amendDescription(const QString &desc, bool monospaced)
# include <QTest>
# include "projectexplorer.h"
# include "metatypedeclarations.h"
# include "outputparser_test.h"
void ProjectExplorerPlugin::testGccOutputParsers_data()
......
......@@ -204,8 +204,6 @@ QStringList GnuMakeParser::searchDirectories() const
# include "projectexplorer.h"
# include "projectexplorerconstants.h"
# include "metatypedeclarations.h"
GnuMakeParserTester::GnuMakeParserTester(GnuMakeParser *p, QObject *parent) :
QObject(parent),
parser(p)
......
......@@ -75,4 +75,3 @@ private:
} // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::IOutputParser*)
......@@ -42,4 +42,3 @@ public:
};
}
Q_DECLARE_METATYPE(ProjectExplorer::IPotentialKit*)
......@@ -128,7 +128,6 @@ void LinuxIccParser::doFlush()
#ifdef WITH_TESTS
# include <QTest>
# include "projectexplorer.h"
# include "metatypedeclarations.h"
# include "outputparser_test.h"
void ProjectExplorerPlugin::testLinuxIccOutputParsers_data()
......
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include <QMetaType>
namespace ProjectExplorer {
class IProjectManager;
class SessionManager;
class Project;
}
// Required for Q_DECLARE_METATYPE of forward-declared types.
Q_DECLARE_OPAQUE_POINTER(ProjectExplorer::Project*)
Q_DECLARE_OPAQUE_POINTER(ProjectExplorer::IProjectManager*)
Q_DECLARE_OPAQUE_POINTER(ProjectExplorer::SessionManager*)
Q_DECLARE_METATYPE(QList<ProjectExplorer::Project*>)
Q_DECLARE_METATYPE(ProjectExplorer::SessionManager*)
Q_DECLARE_METATYPE(ProjectExplorer::IProjectManager*)
......@@ -30,7 +30,6 @@
#include "projectexplorer_export.h"
#include "ioutputparser.h"
#include "metatypedeclarations.h"
#include "task.h"
namespace ProjectExplorer {
......
......@@ -82,4 +82,3 @@ PROJECTEXPLORER_EXPORT QString displayNameFromMap(const QVariantMap &map);
} // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::ProjectConfiguration *)
......@@ -105,7 +105,6 @@ HEADERS += projectexplorer.h \
abstractprocessstep.h \
taskhub.h \
localapplicationruncontrol.h \
metatypedeclarations.h \
headerpath.h \
gcctoolchainfactories.h \
appoutputpane.h \
......
......@@ -95,7 +95,6 @@ QtcPlugin {
"linuxiccparser.cpp", "linuxiccparser.h",
"localapplicationruncontrol.cpp", "localapplicationruncontrol.h",
"localenvironmentaspect.cpp", "localenvironmentaspect.h",
"metatypedeclarations.h",
"miniprojecttargetselector.cpp", "miniprojecttargetselector.h",
"namedwidget.cpp", "namedwidget.h",
"nodesvisitor.cpp", "nodesvisitor.h",
......
......@@ -406,6 +406,3 @@ private:
} // namespace ProjectExplorer
// Allow a RunConfiguration to be stored in a QVariant
Q_DECLARE_METATYPE(ProjectExplorer::RunConfiguration*)
Q_DECLARE_METATYPE(ProjectExplorer::RunControl*)
......@@ -175,4 +175,3 @@ private:
} // namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::Target *)
......@@ -91,4 +91,3 @@ bool PROJECTEXPLORER_EXPORT operator<(const Task &a, const Task &b);
} //namespace ProjectExplorer
Q_DECLARE_METATYPE(ProjectExplorer::Task)
Q_DECLARE_METATYPE(QList<ProjectExplorer::Task>)
......@@ -121,8 +121,6 @@ void XcodebuildParser::stdError(const QString &line)
# include "outputparser_test.h"
# include "projectexplorer.h"
# include "metatypedeclarations.h"
using namespace ProjectExplorer;
Q_DECLARE_METATYPE(ProjectExplorer::XcodebuildParser::XcodebuildStatus)
......
......@@ -85,7 +85,6 @@ void QtParser::stdError(const QString &line)
# include "qtsupportplugin.h"
# include <projectexplorer/projectexplorerconstants.h>
# include <projectexplorer/metatypedeclarations.h>
# include <projectexplorer/outputparser_test.h>
using namespace ProjectExplorer;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment