From d24e1601d7ba825760ed93a49b2f23c980e9d66d Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 29 Oct 2013 15:58:10 +0100 Subject: [PATCH] Qt4ProjectManager: Rename QT4PROJECTMANAGER_{LIBRARY,EXPORT} Change-Id: I6be91281667f7f26740e7b62b08ce9d646bbc85e Reviewed-by: Eike Ziller --- src/plugins/qt4projectmanager/makestep.h | 2 +- .../qt4projectmanager/qmakebuildconfiguration.h | 4 ++-- src/plugins/qt4projectmanager/qmakekitinformation.h | 2 +- src/plugins/qt4projectmanager/qmakenodes.h | 12 ++++++------ src/plugins/qt4projectmanager/qmakeproject.h | 2 +- src/plugins/qt4projectmanager/qmakeprojectmanager.h | 2 +- .../qt4projectmanager/qmakeprojectmanager_global.h | 12 ++++++------ .../qt4projectmanager/qmakerunconfigurationfactory.h | 2 +- src/plugins/qt4projectmanager/qmakestep.h | 2 +- src/plugins/qt4projectmanager/qt4projectmanager.pro | 2 +- .../qt4projectmanager/wizards/abstractmobileapp.h | 4 ++-- .../wizards/abstractmobileappwizard.h | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h index 77086016be..493835a7df 100644 --- a/src/plugins/qt4projectmanager/makestep.h +++ b/src/plugins/qt4projectmanager/makestep.h @@ -71,7 +71,7 @@ public: class QmakeProject; -class QT4PROJECTMANAGER_EXPORT MakeStep : public ProjectExplorer::AbstractProcessStep +class QMAKEPROJECTMANAGER_EXPORT MakeStep : public ProjectExplorer::AbstractProcessStep { Q_OBJECT friend class Internal::MakeStepFactory; diff --git a/src/plugins/qt4projectmanager/qmakebuildconfiguration.h b/src/plugins/qt4projectmanager/qmakebuildconfiguration.h index 235c5bcbff..0e6292c9a9 100644 --- a/src/plugins/qt4projectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qt4projectmanager/qmakebuildconfiguration.h @@ -47,7 +47,7 @@ class QmakeProFileNode; namespace Internal { class QmakeProjectConfigWidget; } -class QT4PROJECTMANAGER_EXPORT QmakeBuildConfiguration : public ProjectExplorer::BuildConfiguration +class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfiguration : public ProjectExplorer::BuildConfiguration { Q_OBJECT @@ -155,7 +155,7 @@ private: friend class QmakeBuildConfigurationFactory; }; -class QT4PROJECTMANAGER_EXPORT QmakeBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory +class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.h b/src/plugins/qt4projectmanager/qmakekitinformation.h index 25d91bc4f7..ae69866af9 100644 --- a/src/plugins/qt4projectmanager/qmakekitinformation.h +++ b/src/plugins/qt4projectmanager/qmakekitinformation.h @@ -36,7 +36,7 @@ namespace QmakeProjectManager { -class QT4PROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::KitInformation +class QMAKEPROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::KitInformation { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qmakenodes.h b/src/plugins/qt4projectmanager/qmakenodes.h index c525720b1a..c515056d37 100644 --- a/src/plugins/qt4projectmanager/qmakenodes.h +++ b/src/plugins/qt4projectmanager/qmakenodes.h @@ -135,7 +135,7 @@ struct InternalNode; } // Implements ProjectNode for qt4 pro files -class QT4PROJECTMANAGER_EXPORT QmakePriFileNode : public ProjectExplorer::ProjectNode +class QMAKEPROJECTMANAGER_EXPORT QmakePriFileNode : public ProjectExplorer::ProjectNode { Q_OBJECT @@ -300,7 +300,7 @@ private: } // namespace Internal -class QT4PROJECTMANAGER_EXPORT TargetInformation +class QMAKEPROJECTMANAGER_EXPORT TargetInformation { public: bool valid; @@ -336,26 +336,26 @@ public: }; -struct QT4PROJECTMANAGER_EXPORT InstallsItem { +struct QMAKEPROJECTMANAGER_EXPORT InstallsItem { InstallsItem(QString p, QStringList f) : path(p), files(f) {} QString path; QStringList files; }; -struct QT4PROJECTMANAGER_EXPORT InstallsList { +struct QMAKEPROJECTMANAGER_EXPORT InstallsList { void clear() { targetPath.clear(); items.clear(); } QString targetPath; QList items; }; -struct QT4PROJECTMANAGER_EXPORT ProjectVersion { +struct QMAKEPROJECTMANAGER_EXPORT ProjectVersion { int major; int minor; int patch; }; // Implements ProjectNode for qt4 pro files -class QT4PROJECTMANAGER_EXPORT QmakeProFileNode : public QmakePriFileNode +class QMAKEPROJECTMANAGER_EXPORT QmakeProFileNode : public QmakePriFileNode { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qmakeproject.h b/src/plugins/qt4projectmanager/qmakeproject.h index 2d08a113e3..25d2ba65d0 100644 --- a/src/plugins/qt4projectmanager/qmakeproject.h +++ b/src/plugins/qt4projectmanager/qmakeproject.h @@ -68,7 +68,7 @@ class QmakeProjectFile; class QmakeNodesWatcher; } -class QT4PROJECTMANAGER_EXPORT QmakeProject : public ProjectExplorer::Project +class QMAKEPROJECTMANAGER_EXPORT QmakeProject : public ProjectExplorer::Project { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qmakeprojectmanager.h b/src/plugins/qt4projectmanager/qmakeprojectmanager.h index 515511c286..c086a0b104 100644 --- a/src/plugins/qt4projectmanager/qmakeprojectmanager.h +++ b/src/plugins/qt4projectmanager/qmakeprojectmanager.h @@ -53,7 +53,7 @@ class QmakeProjectManagerPlugin; class QmakeProject; -class QT4PROJECTMANAGER_EXPORT QmakeManager : public ProjectExplorer::IProjectManager +class QMAKEPROJECTMANAGER_EXPORT QmakeManager : public ProjectExplorer::IProjectManager { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qmakeprojectmanager_global.h b/src/plugins/qt4projectmanager/qmakeprojectmanager_global.h index 8af5a6d3e8..efb1c81827 100644 --- a/src/plugins/qt4projectmanager/qmakeprojectmanager_global.h +++ b/src/plugins/qt4projectmanager/qmakeprojectmanager_global.h @@ -27,15 +27,15 @@ ** ****************************************************************************/ -#ifndef QT4PROJECTMANAGER_GLOBAL_H -#define QT4PROJECTMANAGER_GLOBAL_H +#ifndef QMAKEPROJECTMANAGER_GLOBAL_H +#define QMAKEPROJECTMANAGER_GLOBAL_H #include -#if defined(QT4PROJECTMANAGER_LIBRARY) -# define QT4PROJECTMANAGER_EXPORT Q_DECL_EXPORT +#if defined(QMAKEPROJECTMANAGER_LIBRARY) +# define QMAKEPROJECTMANAGER_EXPORT Q_DECL_EXPORT #else -# define QT4PROJECTMANAGER_EXPORT Q_DECL_IMPORT +# define QMAKEPROJECTMANAGER_EXPORT Q_DECL_IMPORT #endif -#endif // QT4PROJECTMANAGER_GLOBAL_H +#endif // QMAKEPROJECTMANAGER_GLOBAL_H diff --git a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h index 6281cb8e07..677ad12e21 100644 --- a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h +++ b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h @@ -38,7 +38,7 @@ namespace ProjectExplorer { class Node; } namespace QmakeProjectManager { -class QT4PROJECTMANAGER_EXPORT QmakeRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class QMAKEPROJECTMANAGER_EXPORT QmakeRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 826e440db1..1e1ab8fbc4 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -71,7 +71,7 @@ public: } // namespace Internal -class QT4PROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractProcessStep +class QMAKEPROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractProcessStep { Q_OBJECT friend class Internal::QMakeStepFactory; diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro index aa2c2241dc..4f31f0da35 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.pro +++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro @@ -2,7 +2,7 @@ QT += network include(../../qtcreatorplugin.pri) DEFINES += \ - QT4PROJECTMANAGER_LIBRARY + QMAKEPROJECTMANAGER_LIBRARY HEADERS += \ qmakebuildinfo.h \ diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h index e7e0dd1838..0ea6a52504 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h @@ -45,7 +45,7 @@ namespace QmakeProjectManager { /// \internal struct #ifndef CREATORLESSTEST - QT4PROJECTMANAGER_EXPORT + QMAKEPROJECTMANAGER_EXPORT #endif // CREATORLESSTEST AbstractGeneratedFileInfo { @@ -73,7 +73,7 @@ typedef QPair DeploymentFolder; // QPair<.source, .target> /// \internal class #ifndef CREATORLESSTEST - QT4PROJECTMANAGER_EXPORT + QMAKEPROJECTMANAGER_EXPORT #endif // CREATORLESSTEST AbstractMobileApp : public QObject { diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h index dd0476770a..c3b5d6cb69 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h @@ -47,7 +47,7 @@ class AbstractMobileApp; namespace Internal { class MobileAppWizardGenericOptionsPage; } /// \internal -class QT4PROJECTMANAGER_EXPORT AbstractMobileAppWizardDialog : public ProjectExplorer::BaseProjectWizardDialog +class QMAKEPROJECTMANAGER_EXPORT AbstractMobileAppWizardDialog : public ProjectExplorer::BaseProjectWizardDialog { Q_OBJECT @@ -88,7 +88,7 @@ private: }; /// \internal -class QT4PROJECTMANAGER_EXPORT AbstractMobileAppWizard : public Core::BaseFileWizard +class QMAKEPROJECTMANAGER_EXPORT AbstractMobileAppWizard : public Core::BaseFileWizard { Q_OBJECT protected: -- GitLab