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

Put the preprocessor the CPlusPlus namespace

Browse Source
This commit is contained in:
Roberto Raggi
2008-12-08 12:17:39 +01:00
parent 358eceacfd
commit 520a5c9e65
12 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -107,7 +107,7 @@ static const char pp_configuration[] =
namespace CppTools {
namespace Internal {
class CppPreprocessor: public rpp::Client
class CppPreprocessor: public CPlusPlus::Client
{
public:
CppPreprocessor(QPointer<CppModelManager> modelManager);
@@ -132,9 +132,9 @@ protected:
virtual void macroAdded(const QByteArray &macroName,
const QByteArray &macroText);
virtual void startExpandingMacro(unsigned offset,
const rpp::Macro &macro,
const Macro &macro,
const QByteArray &originalText);
virtual void stopExpandingMacro(unsigned offset, const rpp::Macro &macro);
virtual void stopExpandingMacro(unsigned offset, const Macro &macro);
virtual void startSkippingBlocks(unsigned offset);
virtual void stopSkippingBlocks(unsigned offset);
virtual void sourceNeeded(QString &fileName, IncludeType type);
@@ -142,8 +142,8 @@ protected:
private:
QPointer<CppModelManager> m_modelManager;
CppModelManager::DocumentTable m_documents;
rpp::Environment env;
rpp::pp m_proc;
Environment env;
pp m_proc;
QStringList m_includePaths;
QStringList m_systemIncludePaths;
QMap<QString, QByteArray> m_workingCopy;
@@ -304,7 +304,7 @@ void CppPreprocessor::macroAdded(const QByteArray &macroName, const QByteArray &
}
void CppPreprocessor::startExpandingMacro(unsigned offset,
const rpp::Macro &,
const Macro &,
const QByteArray &originalText)
{
if (! m_currentDoc)
@@ -314,7 +314,7 @@ void CppPreprocessor::startExpandingMacro(unsigned offset,
m_currentDoc->addMacroUse(offset, originalText.length());
}
void CppPreprocessor::stopExpandingMacro(unsigned, const rpp::Macro &)
void CppPreprocessor::stopExpandingMacro(unsigned, const Macro &)
{
if (! m_currentDoc)
return;