feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Coding style

Browse Source 
Change-Id: Ib7dc759e8db7cf37fbcd7f75d28b29bf95593d6c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
hjk
2014-02-04 15:53:32 +01:00
parent 944d80dcdc
commit b7ec5fb375
7 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangcodemodelplugin.cpp
View File

@@ -58,7 +58,7 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err
ClangCodeModel::Internal::initializeClang(); ClangCodeModel::Internal::initializeClang();
PCHManager *pchManager = new PCHManager(this); PchManager *pchManager = new PchManager(this);
FastIndexer *fastIndexer = 0; FastIndexer *fastIndexer = 0;
#ifdef CLANG_INDEXING #ifdef CLANG_INDEXING

2
src/plugins/clangcodemodel/clangcompletion.cpp
View File

@@ -216,7 +216,7 @@ IAssistInterface *ClangCompletionAssistProvider::createAssistInterface(
if (part.isNull()) if (part.isNull())
continue; continue;
options = ClangCodeModel::Utils::createClangOptions(part, fileName); options = ClangCodeModel::Utils::createClangOptions(part, fileName);
pchInfo = PCHManager::instance()->pchInfo(part); pchInfo = PchManager::instance()->pchInfo(part);
if (!pchInfo.isNull()) if (!pchInfo.isNull())
options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName())); options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName()));
includePaths = part->includePaths; includePaths = part->includePaths;

2
src/plugins/clangcodemodel/clanghighlightingsupport.cpp
View File

@@ -84,7 +84,7 @@ QFuture<TextEditor::HighlightingResult> ClangHighlightingSupport::highlightingFu
if (part.isNull()) if (part.isNull())
continue; continue;
options = Utils::createClangOptions(part, fileName); options = Utils::createClangOptions(part, fileName);
pchInfo = PCHManager::instance()->pchInfo(part); pchInfo = PchManager::instance()->pchInfo(part);
if (!pchInfo.isNull()) if (!pchInfo.isNull())
options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName())); options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName()));
if (!options.isEmpty()) if (!options.isEmpty())

8
src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp
View File

@@ -79,7 +79,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(Project *project)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
ClangProjectSettings *cps = PCHManager::instance()->settingsForProject(project); ClangProjectSettings *cps = PchManager::instance()->settingsForProject(project);
Q_ASSERT(cps); Q_ASSERT(cps);
QButtonGroup *pchGroup = new QButtonGroup(this); QButtonGroup *pchGroup = new QButtonGroup(this);
@@ -109,7 +109,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(Project *project)
void ClangProjectSettingsWidget::pchUsageChanged(int id) void ClangProjectSettingsWidget::pchUsageChanged(int id)
{ {
ClangProjectSettings *cps = PCHManager::instance()->settingsForProject(m_project); ClangProjectSettings *cps = PchManager::instance()->settingsForProject(m_project);
Q_ASSERT(cps); Q_ASSERT(cps);
cps->setPchUsage(static_cast<ClangProjectSettings::PchUsage>(id)); cps->setPchUsage(static_cast<ClangProjectSettings::PchUsage>(id));
@@ -133,7 +133,7 @@ void ClangProjectSettingsWidget::pchUsageChanged(int id)
void ClangProjectSettingsWidget::customPchFileChanged() void ClangProjectSettingsWidget::customPchFileChanged()
{ {
ClangProjectSettings *cps = PCHManager::instance()->settingsForProject(m_project); ClangProjectSettings *cps = PchManager::instance()->settingsForProject(m_project);
Q_ASSERT(cps); Q_ASSERT(cps);
if (cps->pchUsage() != ClangProjectSettings::PchUse_Custom) if (cps->pchUsage() != ClangProjectSettings::PchUse_Custom)
return; return;
@@ -146,7 +146,7 @@ void ClangProjectSettingsWidget::customPchFileChanged()
void ClangProjectSettingsWidget::customPchButtonClicked() void ClangProjectSettingsWidget::customPchButtonClicked()
{ {
ClangProjectSettings *cps = PCHManager::instance()->settingsForProject(m_project); ClangProjectSettings *cps = PchManager::instance()->settingsForProject(m_project);
Q_ASSERT(cps); Q_ASSERT(cps);
QFileDialog d(this); QFileDialog d(this);

2
src/plugins/clangcodemodel/indexer.cpp
View File

@@ -588,7 +588,7 @@ restart:
CXIndexAction idxAction = clang_IndexAction_create(idx); CXIndexAction idxAction = clang_IndexAction_create(idx);
const unsigned index_opts = CXIndexOpt_SuppressWarnings; const unsigned index_opts = CXIndexOpt_SuppressWarnings;
PCHManager *pchManager = PCHManager::instance(); PchManager *pchManager = PchManager::instance();
PchInfo::Ptr pchInfo = pchManager->pchInfo(pPart); PchInfo::Ptr pchInfo = pchManager->pchInfo(pPart);
for (int i = 0, ei = m_todo.size(); i < ei; ++i) { for (int i = 0, ei = m_todo.size(); i < ei; ++i) {

48
src/plugins/clangcodemodel/pchmanager.cpp
View File

@@ -42,9 +42,9 @@ using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal; using namespace ClangCodeModel::Internal;
using namespace CPlusPlus; using namespace CPlusPlus;
PCHManager *PCHManager::m_instance = 0; PchManager *PchManager::m_instance = 0;
PCHManager::PCHManager(QObject *parent) PchManager::PchManager(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
Q_ASSERT(!m_instance); Q_ASSERT(!m_instance);
@@ -55,10 +55,10 @@ PCHManager::PCHManager(QObject *parent)
msgMgr, SLOT(write(QString,Core::MessageManager::PrintToOutputPaneFlags))); msgMgr, SLOT(write(QString,Core::MessageManager::PrintToOutputPaneFlags)));
connect(&m_pchGenerationWatcher, SIGNAL(finished()), connect(&m_pchGenerationWatcher, SIGNAL(finished()),
this, SLOT(updateActivePCHFiles())); this, SLOT(updateActivePchFiles()));
} }
PCHManager::~PCHManager() PchManager::~PchManager()
{ {
Q_ASSERT(m_instance); Q_ASSERT(m_instance);
m_instance = 0; m_instance = 0;
@@ -66,19 +66,19 @@ PCHManager::~PCHManager()
m_projectSettings.clear(); m_projectSettings.clear();
} }
PCHManager *PCHManager::instance() PchManager *PchManager::instance()
{ {
return m_instance; return m_instance;
} }
PchInfo::Ptr PCHManager::pchInfo(const ProjectPart::Ptr &projectPart) const PchInfo::Ptr PchManager::pchInfo(const ProjectPart::Ptr &projectPart) const
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
return m_activePCHFiles[projectPart]; return m_activePchFiles[projectPart];
} }
ClangProjectSettings *PCHManager::settingsForProject(ProjectExplorer::Project *project) ClangProjectSettings *PchManager::settingsForProject(ProjectExplorer::Project *project)
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
@@ -93,14 +93,14 @@ ClangProjectSettings *PCHManager::settingsForProject(ProjectExplorer::Project *p
return cps; return cps;
} }
void PCHManager::setPCHInfo(const QList<ProjectPart::Ptr> &projectParts, void PchManager::setPCHInfo(const QList<ProjectPart::Ptr> &projectParts,
const PchInfo::Ptr &pchInfo, const PchInfo::Ptr &pchInfo,
const QPair<bool, QStringList> &msgs) const QPair<bool, QStringList> &msgs)
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
foreach (ProjectPart::Ptr pPart, projectParts) foreach (ProjectPart::Ptr pPart, projectParts)
m_activePCHFiles[pPart] = pchInfo; m_activePchFiles[pPart] = pchInfo;
if (pchInfo) { if (pchInfo) {
if (msgs.first) { if (msgs.first) {
@@ -116,7 +116,7 @@ void PCHManager::setPCHInfo(const QList<ProjectPart::Ptr> &projectParts,
} }
} }
void PCHManager::clangProjectSettingsChanged() void PchManager::clangProjectSettingsChanged()
{ {
ClangProjectSettings *cps = qobject_cast<ClangProjectSettings *>(sender()); ClangProjectSettings *cps = qobject_cast<ClangProjectSettings *>(sender());
if (!cps) if (!cps)
@@ -125,7 +125,7 @@ void PCHManager::clangProjectSettingsChanged()
onProjectPartsUpdated(cps->project()); onProjectPartsUpdated(cps->project());
} }
void PCHManager::onAboutToRemoveProject(ProjectExplorer::Project *project) void PchManager::onAboutToRemoveProject(ProjectExplorer::Project *project)
{ {
Q_UNUSED(project); Q_UNUSED(project);
@@ -133,10 +133,10 @@ void PCHManager::onAboutToRemoveProject(ProjectExplorer::Project *project)
// the order of signal delivery, it might already have wiped any information // the order of signal delivery, it might already have wiped any information
// about the project. // about the project.
updateActivePCHFiles(); updateActivePchFiles();
} }
void PCHManager::onProjectPartsUpdated(ProjectExplorer::Project *project) void PchManager::onProjectPartsUpdated(ProjectExplorer::Project *project)
{ {
ClangProjectSettings *cps = settingsForProject(project); ClangProjectSettings *cps = settingsForProject(project);
Q_ASSERT(cps); Q_ASSERT(cps);
@@ -149,7 +149,7 @@ void PCHManager::onProjectPartsUpdated(ProjectExplorer::Project *project)
emit pchInfoUpdated(); emit pchInfoUpdated();
} }
void PCHManager::updatePchInfo(ClangProjectSettings *cps, void PchManager::updatePchInfo(ClangProjectSettings *cps,
const QList<ProjectPart::Ptr> &projectParts) const QList<ProjectPart::Ptr> &projectParts)
{ {
if (m_pchGenerationWatcher.isRunning()) { if (m_pchGenerationWatcher.isRunning()) {
@@ -157,7 +157,7 @@ void PCHManager::updatePchInfo(ClangProjectSettings *cps,
m_pchGenerationWatcher.waitForFinished(); m_pchGenerationWatcher.waitForFinished();
} }
QFuture<void> future = QtConcurrent::run(&PCHManager::doPchInfoUpdate, QFuture<void> future = QtConcurrent::run(&PchManager::doPchInfoUpdate,
cps->pchUsage(), cps->pchUsage(),
cps->customPchFile(), cps->customPchFile(),
projectParts); projectParts);
@@ -214,12 +214,12 @@ CppTools::ProjectFile::Kind getPrefixFileKind(bool hasObjectiveC, bool hasCPlusP
} }
void PCHManager::doPchInfoUpdate(QFutureInterface<void> &future, void PchManager::doPchInfoUpdate(QFutureInterface<void> &future,
ClangProjectSettings::PchUsage pchUsage, ClangProjectSettings::PchUsage pchUsage,
const QString customPchFile, const QString customPchFile,
const QList<ProjectPart::Ptr> projectParts) const QList<ProjectPart::Ptr> projectParts)
{ {
PCHManager *pchManager = PCHManager::instance(); PchManager *pchManager = PchManager::instance();
// qDebug() << "switching to" << pchUsage; // qDebug() << "switching to" << pchUsage;
@@ -391,7 +391,7 @@ void PCHManager::doPchInfoUpdate(QFutureInterface<void> &future,
future.setProgressValue(future.progressValue() + 1); future.setProgressValue(future.progressValue() + 1);
} }
PchInfo::Ptr PCHManager::findMatchingPCH(const QString &inputFileName, PchInfo::Ptr PchManager::findMatchingPCH(const QString &inputFileName,
const QStringList &options, const QStringList &options,
bool fuzzyMatching) const bool fuzzyMatching) const
{ {
@@ -400,7 +400,7 @@ PchInfo::Ptr PCHManager::findMatchingPCH(const QString &inputFileName,
if (fuzzyMatching) { if (fuzzyMatching) {
QStringList opts = options; QStringList opts = options;
opts.sort(); opts.sort();
foreach (PchInfo::Ptr pchInfo, m_activePCHFiles.values()) { foreach (PchInfo::Ptr pchInfo, m_activePchFiles.values()) {
if (pchInfo->inputFileName() != inputFileName) if (pchInfo->inputFileName() != inputFileName)
continue; continue;
QStringList pchOpts = pchInfo->options(); QStringList pchOpts = pchInfo->options();
@@ -409,7 +409,7 @@ PchInfo::Ptr PCHManager::findMatchingPCH(const QString &inputFileName,
return pchInfo; return pchInfo;
} }
} else { } else {
foreach (PchInfo::Ptr pchInfo, m_activePCHFiles.values()) foreach (PchInfo::Ptr pchInfo, m_activePchFiles.values())
if (pchInfo->inputFileName() == inputFileName if (pchInfo->inputFileName() == inputFileName
&& pchInfo->options() == options) && pchInfo->options() == options)
return pchInfo; return pchInfo;
@@ -418,7 +418,7 @@ PchInfo::Ptr PCHManager::findMatchingPCH(const QString &inputFileName,
return PchInfo::Ptr(); return PchInfo::Ptr();
} }
void PCHManager::updateActivePCHFiles() void PchManager::updateActivePchFiles()
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
@@ -426,8 +426,8 @@ void PCHManager::updateActivePCHFiles()
CppTools::CppModelManagerInterface *mmi = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManagerInterface *mmi = CppTools::CppModelManagerInterface::instance();
foreach (const CppTools::CppModelManagerInterface::ProjectInfo &pi, mmi->projectInfos()) foreach (const CppTools::CppModelManagerInterface::ProjectInfo &pi, mmi->projectInfos())
activeParts.unite(QSet<ProjectPart::Ptr>::fromList(pi.projectParts())); activeParts.unite(QSet<ProjectPart::Ptr>::fromList(pi.projectParts()));
QList<ProjectPart::Ptr> partsWithPCHFiles = m_activePCHFiles.keys(); QList<ProjectPart::Ptr> partsWithPCHFiles = m_activePchFiles.keys();
foreach (ProjectPart::Ptr pPart, partsWithPCHFiles) foreach (ProjectPart::Ptr pPart, partsWithPCHFiles)
if (!activeParts.contains(pPart)) if (!activeParts.contains(pPart))
m_activePCHFiles.remove(pPart); m_activePchFiles.remove(pPart);
} }

14
src/plugins/clangcodemodel/pchmanager.h
View File

@@ -45,19 +45,19 @@
namespace ClangCodeModel { namespace ClangCodeModel {
namespace Internal { namespace Internal {
class PCHManager: public QObject class PchManager : public QObject
{ {
Q_OBJECT Q_OBJECT
typedef CppTools::ProjectPart ProjectPart; typedef CppTools::ProjectPart ProjectPart;
static PCHManager *m_instance; static PchManager *m_instance;
public: public:
PCHManager(QObject *parent = 0); PchManager(QObject *parent = 0);
virtual ~PCHManager(); virtual ~PchManager();
static PCHManager *instance(); static PchManager *instance();
PchInfo::Ptr pchInfo(const ProjectPart::Ptr &projectPart) const; PchInfo::Ptr pchInfo(const ProjectPart::Ptr &projectPart) const;
ClangProjectSettings *settingsForProject(ProjectExplorer::Project *project); ClangProjectSettings *settingsForProject(ProjectExplorer::Project *project);
@@ -72,7 +72,7 @@ public slots:
void onProjectPartsUpdated(ProjectExplorer::Project *project); void onProjectPartsUpdated(ProjectExplorer::Project *project);
private slots: private slots:
void updateActivePCHFiles(); void updateActivePchFiles();
private: private:
void updatePchInfo(ClangProjectSettings *cps, void updatePchInfo(ClangProjectSettings *cps,
@@ -89,7 +89,7 @@ private:
private: private:
mutable QMutex m_mutex; mutable QMutex m_mutex;
QHash<ProjectPart::Ptr, PchInfo::Ptr> m_activePCHFiles; QHash<ProjectPart::Ptr, PchInfo::Ptr> m_activePchFiles;
QHash<ProjectExplorer::Project *, ClangProjectSettings *> m_projectSettings; QHash<ProjectExplorer::Project *, ClangProjectSettings *> m_projectSettings;
QFutureWatcher<void> m_pchGenerationWatcher; QFutureWatcher<void> m_pchGenerationWatcher;
}; };