summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/cpptools/cppmodelmanager.cpp14
-rw-r--r--src/plugins/cpptools/rpp/pp-cctype.h4
-rw-r--r--src/plugins/cpptools/rpp/pp-client.h4
-rw-r--r--src/plugins/cpptools/rpp/pp-engine.cpp1
-rw-r--r--src/plugins/cpptools/rpp/pp-engine.h6
-rw-r--r--src/plugins/cpptools/rpp/pp-environment.cpp2
-rw-r--r--src/plugins/cpptools/rpp/pp-environment.h4
-rw-r--r--src/plugins/cpptools/rpp/pp-internal.h4
-rw-r--r--src/plugins/cpptools/rpp/pp-macro-expander.cpp2
-rw-r--r--src/plugins/cpptools/rpp/pp-macro-expander.h4
-rw-r--r--src/plugins/cpptools/rpp/pp-macro.h4
-rw-r--r--src/plugins/cpptools/rpp/pp-scanner.h4
12 files changed, 26 insertions, 27 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 6be28d3625..af885de622 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -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;
diff --git a/src/plugins/cpptools/rpp/pp-cctype.h b/src/plugins/cpptools/rpp/pp-cctype.h
index 62b44f0bf4..bec9c25aef 100644
--- a/src/plugins/cpptools/rpp/pp-cctype.h
+++ b/src/plugins/cpptools/rpp/pp-cctype.h
@@ -55,7 +55,7 @@
#include <cctype>
-namespace rpp {
+namespace CPlusPlus {
inline bool pp_isalpha (int __ch)
{ return std::isalpha ((unsigned char) __ch) != 0; }
@@ -69,6 +69,6 @@ inline bool pp_isdigit (int __ch)
inline bool pp_isspace (int __ch)
{ return std::isspace ((unsigned char) __ch) != 0; }
-} // namespace rpp
+} // namespace CPlusPlus
#endif // PP_CCTYPE_H
diff --git a/src/plugins/cpptools/rpp/pp-client.h b/src/plugins/cpptools/rpp/pp-client.h
index 974004a6ce..35df649733 100644
--- a/src/plugins/cpptools/rpp/pp-client.h
+++ b/src/plugins/cpptools/rpp/pp-client.h
@@ -38,7 +38,7 @@
#include <QString>
#include <QFile>
-namespace rpp {
+namespace CPlusPlus {
class Macro;
@@ -74,6 +74,6 @@ public:
virtual void stopSkippingBlocks(unsigned offset) = 0;
};
-} // namespace rpp
+} // namespace CPlusPlus
#endif // PP_CLIENT_H
diff --git a/src/plugins/cpptools/rpp/pp-engine.cpp b/src/plugins/cpptools/rpp/pp-engine.cpp
index 66e8957f35..f2e1d4908e 100644
--- a/src/plugins/cpptools/rpp/pp-engine.cpp
+++ b/src/plugins/cpptools/rpp/pp-engine.cpp
@@ -57,7 +57,6 @@
#include <QtDebug>
#include <algorithm>
-using namespace rpp;
using namespace CPlusPlus;
namespace {
diff --git a/src/plugins/cpptools/rpp/pp-engine.h b/src/plugins/cpptools/rpp/pp-engine.h
index 13135f6a31..d0729b3715 100644
--- a/src/plugins/cpptools/rpp/pp-engine.h
+++ b/src/plugins/cpptools/rpp/pp-engine.h
@@ -62,7 +62,7 @@ namespace CPlusPlus {
class Token;
}
-namespace rpp {
+namespace CPlusPlus {
struct Value
{
@@ -200,7 +200,7 @@ namespace rpp {
Value evalExpression(TokenIterator firstToken,
TokenIterator lastToken,
- const QByteArray &source) const;
+ const QByteArray &source) const;
QVector<CPlusPlus::Token> tokenize(const QByteArray &text) const;
@@ -226,6 +226,6 @@ namespace rpp {
bool isQtReservedWord(const QByteArray &name) const;
};
-} // namespace rpp
+} // namespace CPlusPlus
#endif // PP_ENGINE_H
diff --git a/src/plugins/cpptools/rpp/pp-environment.cpp b/src/plugins/cpptools/rpp/pp-environment.cpp
index 85e432ae5b..b06d41757d 100644
--- a/src/plugins/cpptools/rpp/pp-environment.cpp
+++ b/src/plugins/cpptools/rpp/pp-environment.cpp
@@ -54,7 +54,7 @@
#include "pp.h"
#include <cstring>
-using namespace rpp;
+using namespace CPlusPlus;
Environment::Environment ()
: currentLine(0),
diff --git a/src/plugins/cpptools/rpp/pp-environment.h b/src/plugins/cpptools/rpp/pp-environment.h
index 5b97c492d7..e3d130871b 100644
--- a/src/plugins/cpptools/rpp/pp-environment.h
+++ b/src/plugins/cpptools/rpp/pp-environment.h
@@ -56,7 +56,7 @@
#include <QVector>
#include <QByteArray>
-namespace rpp {
+namespace CPlusPlus {
struct Macro;
@@ -104,6 +104,6 @@ private:
int _hash_count;
};
-} // namespace rpp
+} // namespace CPlusPlus
#endif // PP_ENVIRONMENT_H
diff --git a/src/plugins/cpptools/rpp/pp-internal.h b/src/plugins/cpptools/rpp/pp-internal.h
index 13bc7c17e8..c11de37453 100644
--- a/src/plugins/cpptools/rpp/pp-internal.h
+++ b/src/plugins/cpptools/rpp/pp-internal.h
@@ -55,7 +55,7 @@
#include <QByteArray>
-namespace rpp {
+namespace CPlusPlus {
namespace _PP_internal {
inline bool comment_p (const char *__first, const char *__last)
@@ -73,6 +73,6 @@ inline bool comment_p (const char *__first, const char *__last)
}
} // _PP_internal
-} // namespace rpp
+} // namespace CPlusPlus
#endif // PP_INTERNAL_H
diff --git a/src/plugins/cpptools/rpp/pp-macro-expander.cpp b/src/plugins/cpptools/rpp/pp-macro-expander.cpp
index 6b569eb132..9ae9702fe1 100644
--- a/src/plugins/cpptools/rpp/pp-macro-expander.cpp
+++ b/src/plugins/cpptools/rpp/pp-macro-expander.cpp
@@ -35,7 +35,7 @@
#include "pp-macro-expander.h"
#include <QDateTime>
-using namespace rpp;
+using namespace CPlusPlus;
MacroExpander::MacroExpander (Environment &env, pp_frame *frame)
: env(env), frame(frame),
diff --git a/src/plugins/cpptools/rpp/pp-macro-expander.h b/src/plugins/cpptools/rpp/pp-macro-expander.h
index dd11540c33..c2f636c138 100644
--- a/src/plugins/cpptools/rpp/pp-macro-expander.h
+++ b/src/plugins/cpptools/rpp/pp-macro-expander.h
@@ -53,7 +53,7 @@
#ifndef PP_MACRO_EXPANDER_H
#define PP_MACRO_EXPANDER_H
-namespace rpp {
+namespace CPlusPlus {
struct pp_frame
{
@@ -97,7 +97,7 @@ namespace rpp {
int generated_lines;
};
-} // namespace rpp
+} // namespace CPlusPlus
#endif // PP_MACRO_EXPANDER_H
diff --git a/src/plugins/cpptools/rpp/pp-macro.h b/src/plugins/cpptools/rpp/pp-macro.h
index a7bbe35e1d..b091abd618 100644
--- a/src/plugins/cpptools/rpp/pp-macro.h
+++ b/src/plugins/cpptools/rpp/pp-macro.h
@@ -56,7 +56,7 @@
#include <QByteArray>
#include <QVector>
-namespace rpp {
+namespace CPlusPlus {
struct Macro
{
@@ -90,6 +90,6 @@ namespace rpp {
{ }
};
-} // namespace rpp
+} // namespace CPlusPlus
#endif // PP_MACRO_H
diff --git a/src/plugins/cpptools/rpp/pp-scanner.h b/src/plugins/cpptools/rpp/pp-scanner.h
index 53fea70b52..85b65403b0 100644
--- a/src/plugins/cpptools/rpp/pp-scanner.h
+++ b/src/plugins/cpptools/rpp/pp-scanner.h
@@ -53,7 +53,7 @@
#ifndef PP_SCANNER_H
#define PP_SCANNER_H
-namespace rpp {
+namespace CPlusPlus {
struct pp_skip_blanks
{
@@ -373,7 +373,7 @@ struct pp_skip_argument
}
};
-} // namespace rpp
+} // namespace CPlusPlus
#endif // PP_SCANNER_H