From 074b111c66133ce137fd883e435f4429ebc4a09f Mon Sep 17 00:00:00 2001 From: Tobias Hunger <qt-info@nokia.com> Date: Wed, 11 Nov 2009 15:25:14 +0100 Subject: [PATCH] Rename BuildParserInterface to IBuildParser. Rename BuildParserInterface to IBuildParser to comply with latest naming conventions. Reviewed-By: con --- src/plugins/projectexplorer/abstractmakestep.h | 2 +- src/plugins/projectexplorer/buildparserfactory.cpp | 4 ++-- src/plugins/projectexplorer/buildparserfactory.h | 6 +++--- src/plugins/projectexplorer/buildstep.h | 2 +- src/plugins/projectexplorer/gccparser.h | 4 ++-- .../{buildparserinterface.cpp => ibuildparser.cpp} | 2 +- .../{buildparserinterface.h => ibuildparser.h} | 12 ++++++------ src/plugins/projectexplorer/metatypedeclarations.h | 4 ++-- src/plugins/projectexplorer/msvcparser.h | 4 ++-- src/plugins/projectexplorer/projectexplorer.pro | 4 ++-- src/plugins/projectexplorer/taskwindow.h | 2 +- src/plugins/qt4projectmanager/makestep.cpp | 2 +- src/plugins/qt4projectmanager/qt-s60/abldparser.cpp | 1 - src/plugins/qt4projectmanager/qt-s60/abldparser.h | 6 +++--- src/plugins/qt4projectmanager/qt-s60/rvctparser.h | 4 ++-- .../qt-s60/s60buildparserfactory.cpp | 2 +- .../qt4projectmanager/qt-s60/s60buildparserfactory.h | 4 ++-- src/plugins/qt4projectmanager/qt-s60/winscwparser.h | 4 ++-- 18 files changed, 34 insertions(+), 35 deletions(-) rename src/plugins/projectexplorer/{buildparserinterface.cpp => ibuildparser.cpp} (97%) rename src/plugins/projectexplorer/{buildparserinterface.h => ibuildparser.h} (88%) diff --git a/src/plugins/projectexplorer/abstractmakestep.h b/src/plugins/projectexplorer/abstractmakestep.h index 813349c7049..87c2ea7da9b 100644 --- a/src/plugins/projectexplorer/abstractmakestep.h +++ b/src/plugins/projectexplorer/abstractmakestep.h @@ -65,7 +65,7 @@ private slots: private: Project *m_project; QString m_buildParserName; - ProjectExplorer::BuildParserInterface *m_buildParser; + ProjectExplorer::IBuildParser *m_buildParser; QString m_buildConfiguration; QSet<QString> m_openDirectories; }; diff --git a/src/plugins/projectexplorer/buildparserfactory.cpp b/src/plugins/projectexplorer/buildparserfactory.cpp index bc47459c643..e4b8895eaee 100644 --- a/src/plugins/projectexplorer/buildparserfactory.cpp +++ b/src/plugins/projectexplorer/buildparserfactory.cpp @@ -44,7 +44,7 @@ bool GccParserFactory::canCreate(const QString & name) const 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) return new GccParser(); @@ -59,7 +59,7 @@ bool MsvcParserFactory::canCreate(const QString & name) const 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) return new MsvcParser(); diff --git a/src/plugins/projectexplorer/buildparserfactory.h b/src/plugins/projectexplorer/buildparserfactory.h index 8f9f0819b73..e29570f2baf 100644 --- a/src/plugins/projectexplorer/buildparserfactory.h +++ b/src/plugins/projectexplorer/buildparserfactory.h @@ -30,7 +30,7 @@ #ifndef BUILDPARSERFACTORY_H #define BUILDPARSERFACTORY_H -#include <projectexplorer/buildparserinterface.h> +#include <projectexplorer/ibuildparser.h> namespace ProjectExplorer { namespace Internal { @@ -42,7 +42,7 @@ public: GccParserFactory() {} virtual ~GccParserFactory(); 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 @@ -52,7 +52,7 @@ public: MsvcParserFactory() {} virtual ~MsvcParserFactory(); 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 diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 2fbdae915f2..4943965f06c 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -30,7 +30,7 @@ #ifndef BUILDSTEP_H #define BUILDSTEP_H -#include "buildparserinterface.h" +#include "ibuildparser.h" #include "projectexplorer_export.h" #include <QtGui/QWidget> diff --git a/src/plugins/projectexplorer/gccparser.h b/src/plugins/projectexplorer/gccparser.h index 415ceea1976..d65c4854b50 100644 --- a/src/plugins/projectexplorer/gccparser.h +++ b/src/plugins/projectexplorer/gccparser.h @@ -30,13 +30,13 @@ #ifndef GCCPARSER_H #define GCCPARSER_H -#include "buildparserinterface.h" +#include "ibuildparser.h" #include <QtCore/QRegExp> namespace ProjectExplorer { -class GccParser : public ProjectExplorer::BuildParserInterface +class GccParser : public ProjectExplorer::IBuildParser { Q_OBJECT diff --git a/src/plugins/projectexplorer/buildparserinterface.cpp b/src/plugins/projectexplorer/ibuildparser.cpp similarity index 97% rename from src/plugins/projectexplorer/buildparserinterface.cpp rename to src/plugins/projectexplorer/ibuildparser.cpp index 36e8339009f..e60d5aaa1fe 100644 --- a/src/plugins/projectexplorer/buildparserinterface.cpp +++ b/src/plugins/projectexplorer/ibuildparser.cpp @@ -27,7 +27,7 @@ ** **************************************************************************/ -#include "buildparserinterface.h" +#include "ibuildparser.h" using namespace ProjectExplorer; diff --git a/src/plugins/projectexplorer/buildparserinterface.h b/src/plugins/projectexplorer/ibuildparser.h similarity index 88% rename from src/plugins/projectexplorer/buildparserinterface.h rename to src/plugins/projectexplorer/ibuildparser.h index 7b1a55e6e2a..40e345b7c9e 100644 --- a/src/plugins/projectexplorer/buildparserinterface.h +++ b/src/plugins/projectexplorer/ibuildparser.h @@ -27,8 +27,8 @@ ** **************************************************************************/ -#ifndef BUILDPARSERINTERFACE_H -#define BUILDPARSERINTERFACE_H +#ifndef IBUILDPARSER_H +#define IBUILDPARSER_H #include "projectexplorer_export.h" @@ -37,11 +37,11 @@ namespace ProjectExplorer { -class PROJECTEXPLORER_EXPORT BuildParserInterface : public QObject +class PROJECTEXPLORER_EXPORT IBuildParser : public QObject { Q_OBJECT public: - virtual ~BuildParserInterface() {} + virtual ~IBuildParser() {} virtual QString name() const = 0; virtual void stdOutput(const QString & line) = 0; @@ -63,9 +63,9 @@ public: IBuildParserFactory() {} virtual ~IBuildParserFactory(); 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 -#endif // BUILDPARSERINTERFACE_H +#endif // IBUILDPARSER_H diff --git a/src/plugins/projectexplorer/metatypedeclarations.h b/src/plugins/projectexplorer/metatypedeclarations.h index 29f52b83aa9..5a9f9d53df9 100644 --- a/src/plugins/projectexplorer/metatypedeclarations.h +++ b/src/plugins/projectexplorer/metatypedeclarations.h @@ -41,7 +41,7 @@ class ProjectInterface; class IProjectManager; class SessionManager; class IApplicationOutput; -class BuildParserInterface; +class IBuildParser; class GlobalConfigManagerInterface; namespace Internal { @@ -59,7 +59,7 @@ Q_DECLARE_METATYPE(ProjectExplorer::IProjectManager*) Q_DECLARE_METATYPE(ProjectExplorer::IApplicationOutput*) Q_DECLARE_METATYPE(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*) #endif // PROJECTEXPLORERMETATYPEDECLARATIONS_H diff --git a/src/plugins/projectexplorer/msvcparser.h b/src/plugins/projectexplorer/msvcparser.h index c6aed2886ae..d3e718a79ae 100644 --- a/src/plugins/projectexplorer/msvcparser.h +++ b/src/plugins/projectexplorer/msvcparser.h @@ -30,14 +30,14 @@ #ifndef MSVCPARSER_H #define MSVCPARSER_H -#include "buildparserinterface.h" +#include "ibuildparser.h" #include "taskwindow.h" #include <QtCore/QRegExp> namespace ProjectExplorer { -class MsvcParser : public ProjectExplorer::BuildParserInterface +class MsvcParser : public ProjectExplorer::IBuildParser { Q_OBJECT diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 8382fcffc71..e0cf043e2bf 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -19,7 +19,7 @@ HEADERS += projectexplorer.h \ session.h \ dependenciespanel.h \ allprojectsfilter.h \ - buildparserinterface.h \ + ibuildparser.h \ projectexplorerconstants.h \ projectexplorersettings.h \ corelistenercheckingforrunningbuild.h \ @@ -84,7 +84,7 @@ SOURCES += projectexplorer.cpp \ pluginfilefactory.cpp \ buildstep.cpp \ buildconfiguration.cpp \ - buildparserinterface.cpp \ + ibuildparser.cpp \ environment.cpp \ buildsettingspropertiespage.cpp \ environmenteditmodel.cpp \ diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index 7fddbcbfba3..1b460e5876b 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -30,7 +30,7 @@ #ifndef TASKWINDOW_H #define TASKWINDOW_H -#include "buildparserinterface.h" +#include "ibuildparser.h" #include <coreplugin/icontext.h> #include <coreplugin/ioutputpane.h> diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 65b5f4a2785..2201f7fdf9b 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -38,7 +38,7 @@ #include <QtCore/QFileInfo> using ProjectExplorer::IBuildParserFactory; -using ProjectExplorer::BuildParserInterface; +using ProjectExplorer::IBuildParser; using ProjectExplorer::Environment; using ExtensionSystem::PluginManager; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp index db831deedfb..e2d73c5f2a4 100644 --- a/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.cpp @@ -31,7 +31,6 @@ #include <utils/qtcassert.h> #include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/buildparserinterface.h> #include <projectexplorer/taskwindow.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/qt4projectmanager/qt-s60/abldparser.h b/src/plugins/qt4projectmanager/qt-s60/abldparser.h index 2a5f616ac17..fad5511e4ab 100644 --- a/src/plugins/qt4projectmanager/qt-s60/abldparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/abldparser.h @@ -30,13 +30,13 @@ #ifndef ABLDPARSER_H #define ABLDPARSER_H -#include <projectexplorer/buildparserinterface.h> +#include <projectexplorer/ibuildparser.h> #include <QtCore/QRegExp> namespace Qt4ProjectManager { -class AbldParser : public ProjectExplorer::BuildParserInterface +class AbldParser : public ProjectExplorer::IBuildParser { Q_OBJECT @@ -48,7 +48,7 @@ public: virtual void stdOutput(const QString & line); virtual void stdError(const QString & line); private: - ProjectExplorer::BuildParserInterface * m_subparser; + ProjectExplorer::IBuildParser * m_subparser; const QString m_name; QRegExp m_perlIssue; diff --git a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h index 9f71c19e016..b1d545a9c4f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/rvctparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/rvctparser.h @@ -30,13 +30,13 @@ #ifndef RVCTPARSER_H #define RVCTPARSER_H -#include <projectexplorer/buildparserinterface.h> +#include <projectexplorer/ibuildparser.h> #include <QtCore/QRegExp> namespace Qt4ProjectManager { -class RvctParser : public ProjectExplorer::BuildParserInterface +class RvctParser : public ProjectExplorer::IBuildParser { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qt-s60/s60buildparserfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/s60buildparserfactory.cpp index 06e650e3945..70befb3a597 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60buildparserfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60buildparserfactory.cpp @@ -49,7 +49,7 @@ bool S60ParserFactory::canCreate(const QString & name) const (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)) return new RvctParser(); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60buildparserfactory.h b/src/plugins/qt4projectmanager/qt-s60/s60buildparserfactory.h index b3ea2e66067..fd162bfbfe1 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60buildparserfactory.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60buildparserfactory.h @@ -30,7 +30,7 @@ #ifndef S60BUILDPARSERFACTORY_H #define S60BUILDPARSERFACTORY_H -#include <projectexplorer/buildparserinterface.h> +#include <projectexplorer/ibuildparser.h> namespace Qt4ProjectManager { namespace Internal { @@ -42,7 +42,7 @@ public: S60ParserFactory() {} virtual ~S60ParserFactory(); 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 diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.h b/src/plugins/qt4projectmanager/qt-s60/winscwparser.h index 2e4e55de46c..5b41db18594 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.h +++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.h @@ -30,13 +30,13 @@ #ifndef WINSCWPARSER_H #define WINSCWPARSER_H -#include <projectexplorer/buildparserinterface.h> +#include <projectexplorer/ibuildparser.h> #include <QtCore/QRegExp> namespace Qt4ProjectManager { -class WinscwParser : public ProjectExplorer::BuildParserInterface +class WinscwParser : public ProjectExplorer::IBuildParser { Q_OBJECT -- GitLab