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

C++: Only parse with appropriate defines for open editors.

Browse Source 
If two files from different (sub-)projects include the same header file,
and the defined macros differ for both files, the header file will be
parsed with only the appropriate macros for the including file.

Task-number: QTCREATORBUG-9802
Task-number: QTCREATORBUG-1249

Change-Id: I560490afa287b3bb1e863bce1bb4f57af36ad56e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2013-08-19 16:05:29 +02:00
parent 447c4ed37f
commit ba2d7a4fa7
22 changed files with 570 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/plugins/cpptools/cppsnapshotupdater.h Normal file
View File

@@ -0,0 +1,84 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef CPPTOOLS_INTERNAL_SNAPSHOTUPDATER_H
#define CPPTOOLS_INTERNAL_SNAPSHOTUPDATER_H
#include "cpptools_global.h"
#include "cppmodelmanager.h"
#include <cplusplus/CppDocument.h>
#include <cplusplus/DependencyTable.h>
#include <QMutex>
#include <QString>
namespace CppTools {
class CPPTOOLS_EXPORT SnapshotUpdater
{
Q_DISABLE_COPY(SnapshotUpdater)
public:
SnapshotUpdater(const QString &fileInEditor = QString());
QString fileInEditor() const
{ return m_fileInEditor; }
void update(CppModelManagerInterface::WorkingCopy workingCopy);
CPlusPlus::Document::Ptr document() const;
CPlusPlus::Snapshot snapshot() const
{ return m_snapshot; }
QStringList includePaths() const
{ return m_includePaths; }
QStringList frameworkPaths() const
{ return m_frameworkPaths; }
private:
void updateProjectPart();
void addFileAndDependencies(QSet<QString> *toRemove, const QString &fileName) const;
private:
mutable QMutex m_mutex;
QString m_fileInEditor;
ProjectPart::Ptr m_projectPart;
QByteArray m_configFile;
QStringList m_includePaths;
QStringList m_frameworkPaths;
CPlusPlus::Snapshot m_snapshot;
CPlusPlus::DependencyTable m_deps;
};
} // namespace CppTools
#endif // CPPTOOLS_INTERNAL_SNAPSHOTUPDATER_H