Differential D4095 Diff 10472 projectmanagers/cmake/cmakeprojectdata.h

Changeset View

Standalone View

View Options

projectmanagers/cmake/cmakeprojectdata.h

1/* KDevelop CMake Support 1​/* KDevelop CMake Support
2 * 2​ *
3 * Copyright 2013 Aleix Pol <aleixpol@kde.org> 3​ * Copyright 2013-2017 Aleix Pol <aleixpol@kde.org>
4 * 4​ *
5 * This program is free software; you can redistribute it and/or 5​ * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License 6​ * modify it under the terms of the GNU General Public License
7 * as published by the Free Software Foundation; either version 2 7​ * as published by the Free Software Foundation; either version 2
8 * of the License, or (at your option) any later version. 8​ * of the License, or (at your option) any later version.
9 * 9​ *
10 * This program is distributed in the hope that it will be useful, 10​ * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11​ * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details. 13​ * GNU General Public License for more details.
14 * 14​ *
15 * You should have received a copy of the GNU General Public License 15​ * You should have received a copy of the GNU General Public License
16 * along with this program; if not, write to the Free Software 16​ * along with this program; if not, write to the Free Software
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 17​ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
18 * 02110-1301, USA. 18​ * 02110-1301, USA.
19 */ 19​ */
20 20​
21#ifndef CMAKEPROJECTDATA_H 21​#ifndef CMAKEPROJECTDATA_H
22#define CMAKEPROJECTDATA_H 22​#define CMAKEPROJECTDATA_H
23 23​
24​#include <QPointer>
24#include <QSharedPointer> 25​#include <QSharedPointer>
25#include <QStringList> 26​#include <QStringList>
27​#include <QJsonObject>
28​#include <QProcess>
26#include <QFileSystemWatcher> 29​#include <QFileSystemWatcher>
27#include "cmaketypes.h" 30​#include "cmaketypes.h"
28#include <util/path.h> 31​#include <util/path.h>
29 32​
33​class CMakeServer;
34​
30/** 35​/**
31 * Represents any file in a cmake project that has been added 36​ * Represents any file in a cmake project that has been added
32 * to the project. 37​ * to the project.
33 * 38​ *
34 * Contains the required information to compile it properly 39​ * Contains the required information to compile it properly
35 */ 40​ */
36struct CMakeFile 41​struct CMakeFile
37{ 42​{
38 KDevelop::Path::List includes; 43​ KDevelop::Path::List includes;
39 KDevelop::Path::List frameworkDirectories; 44​ KDevelop::Path::List frameworkDirectories;
40 QHash<QString, QString> defines; 45​ QHash<QString, QString> defines;
41}; 46​};
42inline QDebug &operator<<(QDebug debug, const CMakeFile& file) 47​inline QDebug &operator<<(QDebug debug, const CMakeFile& file)
43{ 48​{
44 debug << "CMakeFile(-I" << file.includes << ", -F" << file.frameworkDirectories << ", -D" << file.defines << ")"; 49​ debug << "CMakeFile(-I" << file.includes << ", -F" << file.frameworkDirectories << ", -D" << file.defines << ")";
45 return debug.maybeSpace(); 50​ return debug.maybeSpace();
46} 51​}
47 52​
48struct CMakeJsonData 53​struct CMakeFilesCompilationData
49{ 54​{
50 QHash<KDevelop::Path, CMakeFile> files; 55​ QHash<KDevelop::Path, CMakeFile> files;
51 bool isValid = false; 56​ bool isValid = false;
52}; 57​};
53 58​
54struct CMakeProjectData 59​struct CMakeProjectData
55{ 60​{
61​ CMakeProjectData(const QHash<KDevelop::Path, QStringList> &targets, const CMakeFilesCompilationData &data, const QVector<Test> &tests);
mwolffUnsubmitted
Done

& next to type names

mwolff: & next to type names
62​
56 CMakeProjectData() : watcher(new QFileSystemWatcher) {} 63​ CMakeProjectData() : watcher(new QFileSystemWatcher) {}
57 ~CMakeProjectData() {} 64​ ~CMakeProjectData() {}
58 65​
59 CMakeProperties properties; 66​ CMakeFilesCompilationData compilationData;
60 CacheValues cache; ​
61 CMakeJsonData jsonData; ​
62 QHash<KDevelop::Path, QStringList> targets; 67​ QHash<KDevelop::Path, QStringList> targets;
63 QSharedPointer<QFileSystemWatcher> watcher; 68​ QSharedPointer<QFileSystemWatcher> watcher;
69​ QSharedPointer<CMakeServer> m_server;
70​
71​ QVector<Test> m_testSuites;
mwolffUnsubmitted
Done

simply make it public like the stuff above and remove the getter?

mwolff: simply make it public like the stuff above and remove the getter?
64}; 72​};
65 73​
66#endif 74​#endif