From 07c0ca5ef5194355ec5fce86ade1382144ce6e99 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 9 Feb 2017 23:30:14 +0100 Subject: [PATCH] qmake: use class instead of struct Change-Id: Ieb0d7557555c4a0c2e196b28841972483f3fd135 Reviewed-by: Tim Jenssen --- src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 3 ++- src/plugins/qmakeprojectmanager/qmakeparsernodes.h | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 010eb1ab17d..d41864753cc 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -68,7 +68,8 @@ namespace { // for file types and the project. Do some magic via qAddPostRoutine() // to make sure the icons do not outlive QApplication, triggering warnings on X11. -struct FileTypeDataStorage { +class FileTypeDataStorage { +public: FileType type; const char *typeName; const char *icon; diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h index c425fbcb196..98605ed0c1d 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.h +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.h @@ -103,7 +103,7 @@ class QmakeEvalResult; class QmakePriFileEvalResult; } // namespace Internal; -struct InstallsParserList; +class InstallsParserList; // Implements ProjectNode for qmake .pri files class QMAKEPROJECTMANAGER_EXPORT QmakePriFile : public ProjectExplorer::ProjectNode @@ -248,7 +248,8 @@ public: TargetParserInformation(const TargetParserInformation &other) = default; }; -struct QMAKEPROJECTMANAGER_EXPORT InstallsParserItem { +class QMAKEPROJECTMANAGER_EXPORT InstallsParserItem { +public: InstallsParserItem() = default; InstallsParserItem(QString p, QVector f, bool a) : path(p), files(f), active(a) {} @@ -257,7 +258,8 @@ struct QMAKEPROJECTMANAGER_EXPORT InstallsParserItem { bool active = false; }; -struct QMAKEPROJECTMANAGER_EXPORT InstallsParserList { +class QMAKEPROJECTMANAGER_EXPORT InstallsParserList { +public: void clear() { targetPath.clear(); items.clear(); } QString targetPath; QVector items;