forked from qt-creator/qt-creator
Rename BuildParserInterface to IBuildParser.
Rename BuildParserInterface to IBuildParser to comply with latest naming conventions. Reviewed-By: con
This commit is contained in:
@@ -65,7 +65,7 @@ private slots:
|
|||||||
private:
|
private:
|
||||||
Project *m_project;
|
Project *m_project;
|
||||||
QString m_buildParserName;
|
QString m_buildParserName;
|
||||||
ProjectExplorer::BuildParserInterface *m_buildParser;
|
ProjectExplorer::IBuildParser *m_buildParser;
|
||||||
QString m_buildConfiguration;
|
QString m_buildConfiguration;
|
||||||
QSet<QString> m_openDirectories;
|
QSet<QString> m_openDirectories;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ bool GccParserFactory::canCreate(const QString & name) const
|
|||||||
return (name == Constants::BUILD_PARSER_GCC);
|
return (name == Constants::BUILD_PARSER_GCC);
|
||||||
}
|
}
|
||||||
|
|
||||||
ProjectExplorer::BuildParserInterface * GccParserFactory::create(const QString & name) const
|
ProjectExplorer::IBuildParser * GccParserFactory::create(const QString & name) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(name)
|
Q_UNUSED(name)
|
||||||
return new GccParser();
|
return new GccParser();
|
||||||
@@ -59,7 +59,7 @@ bool MsvcParserFactory::canCreate(const QString & name) const
|
|||||||
return (name == Constants::BUILD_PARSER_MSVC);
|
return (name == Constants::BUILD_PARSER_MSVC);
|
||||||
}
|
}
|
||||||
|
|
||||||
ProjectExplorer::BuildParserInterface * MsvcParserFactory::create(const QString & name) const
|
ProjectExplorer::IBuildParser * MsvcParserFactory::create(const QString & name) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(name)
|
Q_UNUSED(name)
|
||||||
return new MsvcParser();
|
return new MsvcParser();
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
#ifndef BUILDPARSERFACTORY_H
|
#ifndef BUILDPARSERFACTORY_H
|
||||||
#define BUILDPARSERFACTORY_H
|
#define BUILDPARSERFACTORY_H
|
||||||
|
|
||||||
#include <projectexplorer/buildparserinterface.h>
|
#include <projectexplorer/ibuildparser.h>
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
@@ -42,7 +42,7 @@ public:
|
|||||||
GccParserFactory() {}
|
GccParserFactory() {}
|
||||||
virtual ~GccParserFactory();
|
virtual ~GccParserFactory();
|
||||||
virtual bool canCreate(const QString & name) const;
|
virtual bool canCreate(const QString & name) const;
|
||||||
virtual ProjectExplorer::BuildParserInterface * create(const QString & name) const;
|
virtual ProjectExplorer::IBuildParser * create(const QString & name) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
class MsvcParserFactory : public ProjectExplorer::IBuildParserFactory
|
class MsvcParserFactory : public ProjectExplorer::IBuildParserFactory
|
||||||
@@ -52,7 +52,7 @@ public:
|
|||||||
MsvcParserFactory() {}
|
MsvcParserFactory() {}
|
||||||
virtual ~MsvcParserFactory();
|
virtual ~MsvcParserFactory();
|
||||||
virtual bool canCreate(const QString & name) const;
|
virtual bool canCreate(const QString & name) const;
|
||||||
virtual ProjectExplorer::BuildParserInterface * create(const QString & name) const;
|
virtual ProjectExplorer::IBuildParser * create(const QString & name) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
#ifndef BUILDSTEP_H
|
#ifndef BUILDSTEP_H
|
||||||
#define BUILDSTEP_H
|
#define BUILDSTEP_H
|
||||||
|
|
||||||
#include "buildparserinterface.h"
|
#include "ibuildparser.h"
|
||||||
#include "projectexplorer_export.h"
|
#include "projectexplorer_export.h"
|
||||||
|
|
||||||
#include <QtGui/QWidget>
|
#include <QtGui/QWidget>
|
||||||
|
|||||||
@@ -30,13 +30,13 @@
|
|||||||
#ifndef GCCPARSER_H
|
#ifndef GCCPARSER_H
|
||||||
#define GCCPARSER_H
|
#define GCCPARSER_H
|
||||||
|
|
||||||
#include "buildparserinterface.h"
|
#include "ibuildparser.h"
|
||||||
|
|
||||||
#include <QtCore/QRegExp>
|
#include <QtCore/QRegExp>
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
|
|
||||||
class GccParser : public ProjectExplorer::BuildParserInterface
|
class GccParser : public ProjectExplorer::IBuildParser
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
**
|
**
|
||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
||||||
#include "buildparserinterface.h"
|
#include "ibuildparser.h"
|
||||||
|
|
||||||
using namespace ProjectExplorer;
|
using namespace ProjectExplorer;
|
||||||
|
|
||||||
@@ -27,8 +27,8 @@
|
|||||||
**
|
**
|
||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
||||||
#ifndef BUILDPARSERINTERFACE_H
|
#ifndef IBUILDPARSER_H
|
||||||
#define BUILDPARSERINTERFACE_H
|
#define IBUILDPARSER_H
|
||||||
|
|
||||||
#include "projectexplorer_export.h"
|
#include "projectexplorer_export.h"
|
||||||
|
|
||||||
@@ -37,11 +37,11 @@
|
|||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
|
|
||||||
class PROJECTEXPLORER_EXPORT BuildParserInterface : public QObject
|
class PROJECTEXPLORER_EXPORT IBuildParser : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
virtual ~BuildParserInterface() {}
|
virtual ~IBuildParser() {}
|
||||||
virtual QString name() const = 0;
|
virtual QString name() const = 0;
|
||||||
|
|
||||||
virtual void stdOutput(const QString & line) = 0;
|
virtual void stdOutput(const QString & line) = 0;
|
||||||
@@ -63,9 +63,9 @@ public:
|
|||||||
IBuildParserFactory() {}
|
IBuildParserFactory() {}
|
||||||
virtual ~IBuildParserFactory();
|
virtual ~IBuildParserFactory();
|
||||||
virtual bool canCreate(const QString & name) const = 0;
|
virtual bool canCreate(const QString & name) const = 0;
|
||||||
virtual BuildParserInterface * create(const QString & name) const = 0;
|
virtual IBuildParser * create(const QString & name) const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace ProjectExplorer
|
} // namespace ProjectExplorer
|
||||||
|
|
||||||
#endif // BUILDPARSERINTERFACE_H
|
#endif // IBUILDPARSER_H
|
||||||
@@ -41,7 +41,7 @@ class ProjectInterface;
|
|||||||
class IProjectManager;
|
class IProjectManager;
|
||||||
class SessionManager;
|
class SessionManager;
|
||||||
class IApplicationOutput;
|
class IApplicationOutput;
|
||||||
class BuildParserInterface;
|
class IBuildParser;
|
||||||
class GlobalConfigManagerInterface;
|
class GlobalConfigManagerInterface;
|
||||||
|
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
@@ -59,7 +59,7 @@ Q_DECLARE_METATYPE(ProjectExplorer::IProjectManager*)
|
|||||||
Q_DECLARE_METATYPE(ProjectExplorer::IApplicationOutput*)
|
Q_DECLARE_METATYPE(ProjectExplorer::IApplicationOutput*)
|
||||||
Q_DECLARE_METATYPE(ProjectExplorer::Internal::CommandQObject*)
|
Q_DECLARE_METATYPE(ProjectExplorer::Internal::CommandQObject*)
|
||||||
Q_DECLARE_METATYPE(QList<ProjectExplorer::Internal::CommandQObject*>)
|
Q_DECLARE_METATYPE(QList<ProjectExplorer::Internal::CommandQObject*>)
|
||||||
Q_DECLARE_METATYPE(ProjectExplorer::BuildParserInterface*)
|
Q_DECLARE_METATYPE(ProjectExplorer::IBuildParser*)
|
||||||
|
|
||||||
Q_DECLARE_METATYPE(ProjectExplorer::GlobalConfigManagerInterface*)
|
Q_DECLARE_METATYPE(ProjectExplorer::GlobalConfigManagerInterface*)
|
||||||
#endif // PROJECTEXPLORERMETATYPEDECLARATIONS_H
|
#endif // PROJECTEXPLORERMETATYPEDECLARATIONS_H
|
||||||
|
|||||||
@@ -30,14 +30,14 @@
|
|||||||
#ifndef MSVCPARSER_H
|
#ifndef MSVCPARSER_H
|
||||||
#define MSVCPARSER_H
|
#define MSVCPARSER_H
|
||||||
|
|
||||||
#include "buildparserinterface.h"
|
#include "ibuildparser.h"
|
||||||
#include "taskwindow.h"
|
#include "taskwindow.h"
|
||||||
|
|
||||||
#include <QtCore/QRegExp>
|
#include <QtCore/QRegExp>
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
|
|
||||||
class MsvcParser : public ProjectExplorer::BuildParserInterface
|
class MsvcParser : public ProjectExplorer::IBuildParser
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ HEADERS += projectexplorer.h \
|
|||||||
session.h \
|
session.h \
|
||||||
dependenciespanel.h \
|
dependenciespanel.h \
|
||||||
allprojectsfilter.h \
|
allprojectsfilter.h \
|
||||||
buildparserinterface.h \
|
ibuildparser.h \
|
||||||
projectexplorerconstants.h \
|
projectexplorerconstants.h \
|
||||||
projectexplorersettings.h \
|
projectexplorersettings.h \
|
||||||
corelistenercheckingforrunningbuild.h \
|
corelistenercheckingforrunningbuild.h \
|
||||||
@@ -84,7 +84,7 @@ SOURCES += projectexplorer.cpp \
|
|||||||
pluginfilefactory.cpp \
|
pluginfilefactory.cpp \
|
||||||
buildstep.cpp \
|
buildstep.cpp \
|
||||||
buildconfiguration.cpp \
|
buildconfiguration.cpp \
|
||||||
buildparserinterface.cpp \
|
ibuildparser.cpp \
|
||||||
environment.cpp \
|
environment.cpp \
|
||||||
buildsettingspropertiespage.cpp \
|
buildsettingspropertiespage.cpp \
|
||||||
environmenteditmodel.cpp \
|
environmenteditmodel.cpp \
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
#ifndef TASKWINDOW_H
|
#ifndef TASKWINDOW_H
|
||||||
#define TASKWINDOW_H
|
#define TASKWINDOW_H
|
||||||
|
|
||||||
#include "buildparserinterface.h"
|
#include "ibuildparser.h"
|
||||||
|
|
||||||
#include <coreplugin/icontext.h>
|
#include <coreplugin/icontext.h>
|
||||||
#include <coreplugin/ioutputpane.h>
|
#include <coreplugin/ioutputpane.h>
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
#include <QtCore/QFileInfo>
|
#include <QtCore/QFileInfo>
|
||||||
|
|
||||||
using ProjectExplorer::IBuildParserFactory;
|
using ProjectExplorer::IBuildParserFactory;
|
||||||
using ProjectExplorer::BuildParserInterface;
|
using ProjectExplorer::IBuildParser;
|
||||||
using ProjectExplorer::Environment;
|
using ProjectExplorer::Environment;
|
||||||
using ExtensionSystem::PluginManager;
|
using ExtensionSystem::PluginManager;
|
||||||
using namespace Qt4ProjectManager;
|
using namespace Qt4ProjectManager;
|
||||||
|
|||||||
@@ -31,7 +31,6 @@
|
|||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
|
|
||||||
#include <projectexplorer/projectexplorerconstants.h>
|
#include <projectexplorer/projectexplorerconstants.h>
|
||||||
#include <projectexplorer/buildparserinterface.h>
|
|
||||||
#include <projectexplorer/taskwindow.h>
|
#include <projectexplorer/taskwindow.h>
|
||||||
|
|
||||||
#include <extensionsystem/pluginmanager.h>
|
#include <extensionsystem/pluginmanager.h>
|
||||||
|
|||||||
@@ -30,13 +30,13 @@
|
|||||||
#ifndef ABLDPARSER_H
|
#ifndef ABLDPARSER_H
|
||||||
#define ABLDPARSER_H
|
#define ABLDPARSER_H
|
||||||
|
|
||||||
#include <projectexplorer/buildparserinterface.h>
|
#include <projectexplorer/ibuildparser.h>
|
||||||
|
|
||||||
#include <QtCore/QRegExp>
|
#include <QtCore/QRegExp>
|
||||||
|
|
||||||
namespace Qt4ProjectManager {
|
namespace Qt4ProjectManager {
|
||||||
|
|
||||||
class AbldParser : public ProjectExplorer::BuildParserInterface
|
class AbldParser : public ProjectExplorer::IBuildParser
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ public:
|
|||||||
virtual void stdOutput(const QString & line);
|
virtual void stdOutput(const QString & line);
|
||||||
virtual void stdError(const QString & line);
|
virtual void stdError(const QString & line);
|
||||||
private:
|
private:
|
||||||
ProjectExplorer::BuildParserInterface * m_subparser;
|
ProjectExplorer::IBuildParser * m_subparser;
|
||||||
const QString m_name;
|
const QString m_name;
|
||||||
|
|
||||||
QRegExp m_perlIssue;
|
QRegExp m_perlIssue;
|
||||||
|
|||||||
@@ -30,13 +30,13 @@
|
|||||||
#ifndef RVCTPARSER_H
|
#ifndef RVCTPARSER_H
|
||||||
#define RVCTPARSER_H
|
#define RVCTPARSER_H
|
||||||
|
|
||||||
#include <projectexplorer/buildparserinterface.h>
|
#include <projectexplorer/ibuildparser.h>
|
||||||
|
|
||||||
#include <QtCore/QRegExp>
|
#include <QtCore/QRegExp>
|
||||||
|
|
||||||
namespace Qt4ProjectManager {
|
namespace Qt4ProjectManager {
|
||||||
|
|
||||||
class RvctParser : public ProjectExplorer::BuildParserInterface
|
class RvctParser : public ProjectExplorer::IBuildParser
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ bool S60ParserFactory::canCreate(const QString & name) const
|
|||||||
(name == QLatin1String(ProjectExplorer::Constants::BUILD_PARSER_WINSCW)));
|
(name == QLatin1String(ProjectExplorer::Constants::BUILD_PARSER_WINSCW)));
|
||||||
}
|
}
|
||||||
|
|
||||||
ProjectExplorer::BuildParserInterface * S60ParserFactory::create(const QString & name) const
|
ProjectExplorer::IBuildParser * S60ParserFactory::create(const QString & name) const
|
||||||
{
|
{
|
||||||
if (name == QLatin1String(ProjectExplorer::Constants::BUILD_PARSER_RVCT))
|
if (name == QLatin1String(ProjectExplorer::Constants::BUILD_PARSER_RVCT))
|
||||||
return new RvctParser();
|
return new RvctParser();
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
#ifndef S60BUILDPARSERFACTORY_H
|
#ifndef S60BUILDPARSERFACTORY_H
|
||||||
#define S60BUILDPARSERFACTORY_H
|
#define S60BUILDPARSERFACTORY_H
|
||||||
|
|
||||||
#include <projectexplorer/buildparserinterface.h>
|
#include <projectexplorer/ibuildparser.h>
|
||||||
|
|
||||||
namespace Qt4ProjectManager {
|
namespace Qt4ProjectManager {
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
@@ -42,7 +42,7 @@ public:
|
|||||||
S60ParserFactory() {}
|
S60ParserFactory() {}
|
||||||
virtual ~S60ParserFactory();
|
virtual ~S60ParserFactory();
|
||||||
virtual bool canCreate(const QString & name) const;
|
virtual bool canCreate(const QString & name) const;
|
||||||
virtual ProjectExplorer::BuildParserInterface * create(const QString & name) const;
|
virtual ProjectExplorer::IBuildParser * create(const QString & name) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
|
|||||||
@@ -30,13 +30,13 @@
|
|||||||
#ifndef WINSCWPARSER_H
|
#ifndef WINSCWPARSER_H
|
||||||
#define WINSCWPARSER_H
|
#define WINSCWPARSER_H
|
||||||
|
|
||||||
#include <projectexplorer/buildparserinterface.h>
|
#include <projectexplorer/ibuildparser.h>
|
||||||
|
|
||||||
#include <QtCore/QRegExp>
|
#include <QtCore/QRegExp>
|
||||||
|
|
||||||
namespace Qt4ProjectManager {
|
namespace Qt4ProjectManager {
|
||||||
|
|
||||||
class WinscwParser : public ProjectExplorer::BuildParserInterface
|
class WinscwParser : public ProjectExplorer::IBuildParser
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user