From ea64453210a39a349b67a3fbadcd84865b87cb15 Mon Sep 17 00:00:00 2001 From: Roberto Raggi <roberto.raggi@nokia.com> Date: Tue, 5 May 2009 12:35:04 +0200 Subject: [PATCH] Protect the rewriter. --- src/plugins/duieditor/rewriter/rewriter.cpp | 1 + src/plugins/duieditor/rewriter/rewriter.h | 6 ++++++ src/plugins/duieditor/rewriter/textwriter.cpp | 2 ++ src/plugins/duieditor/rewriter/textwriter.h | 5 +++++ 4 files changed, 14 insertions(+) diff --git a/src/plugins/duieditor/rewriter/rewriter.cpp b/src/plugins/duieditor/rewriter/rewriter.cpp index 81f471fbb97..89406a45211 100644 --- a/src/plugins/duieditor/rewriter/rewriter.cpp +++ b/src/plugins/duieditor/rewriter/rewriter.cpp @@ -2,6 +2,7 @@ #include "parser/javascriptast_p.h" using namespace JavaScript; +using namespace DuiEditor::Internal; void Rewriter::replace(const AST::SourceLocation &loc, const QString &text) { replace(loc.offset, loc.length, text); } diff --git a/src/plugins/duieditor/rewriter/rewriter.h b/src/plugins/duieditor/rewriter/rewriter.h index 03d4731b336..17ebe97c97c 100644 --- a/src/plugins/duieditor/rewriter/rewriter.h +++ b/src/plugins/duieditor/rewriter/rewriter.h @@ -7,6 +7,9 @@ #include "textwriter.h" #include "parser/javascriptastvisitor_p.h" +namespace DuiEditor { +namespace Internal { + //////////////////////////////////////////////////////////////////////////////// // Replacement //////////////////////////////////////////////////////////////////////////////// @@ -97,4 +100,7 @@ private: QList<Replacement> _replacementList; }; +} // end of namespace Internal +} // end of namespace DuiEditor + #endif // REWRITER_H diff --git a/src/plugins/duieditor/rewriter/textwriter.cpp b/src/plugins/duieditor/rewriter/textwriter.cpp index cd61138bef7..bb4f6c44b0c 100644 --- a/src/plugins/duieditor/rewriter/textwriter.cpp +++ b/src/plugins/duieditor/rewriter/textwriter.cpp @@ -1,5 +1,7 @@ #include "textwriter.h" +using namespace DuiEditor::Internal; + TextWriter::TextWriter() :string(0), cursor(0) { diff --git a/src/plugins/duieditor/rewriter/textwriter.h b/src/plugins/duieditor/rewriter/textwriter.h index dcd3a5f472b..38104a6b89a 100644 --- a/src/plugins/duieditor/rewriter/textwriter.h +++ b/src/plugins/duieditor/rewriter/textwriter.h @@ -5,6 +5,8 @@ #include <QList> #include <QTextCursor> +namespace DuiEditor { +namespace Internal { class TextWriter { @@ -46,4 +48,7 @@ public: }; +} // end of namespace Internal +} // end of namespace DuiEditor + #endif // TEXTWRITER_H -- GitLab