wip

1 files changed, 7 insertions, 11 deletions

diff --git a/fluid/nodes/Tree.cxx b/fluid/nodes/Tree.cxx
index d437b5bd3..e11c399e2 100644
--- a/fluid/nodes/Tree.cxx
+++ b/fluid/nodes/Tree.cxx
@@ -19,11 +19,7 @@
 
 #include "Project.h"
 
-using namespace fld;
-using namespace fld::node;
-
-
-Tree::Iterator::Iterator(Node *t, bool only_selected)
+fld::node::Tree::Iterator::Iterator(Node *t, bool only_selected)
 : type_(t)
 , only_selected_(only_selected)
 {
@@ -36,7 +32,7 @@ Tree::Iterator::Iterator(Node *t, bool only_selected)
   }
 }
 
-Tree::Iterator &Tree::Iterator::operator++() {
+fld::node::Tree::Iterator &fld::node::Tree::Iterator::operator++() {
   if (only_selected_) {
     do {
       type_ = type_->next;
@@ -47,7 +43,7 @@ Tree::Iterator &Tree::Iterator::operator++() {
   return *this;
 }
 
-Tree::WIterator::WIterator(Node *t, bool only_selected)
+fld::node::Tree::WIterator::WIterator(Node *t, bool only_selected)
 : type_(t)
 , only_selected_(only_selected)
 {
@@ -64,7 +60,7 @@ Tree::WIterator::WIterator(Node *t, bool only_selected)
   }
 }
 
-Tree::WIterator& Tree::WIterator::operator++() {
+fld::node::Tree::WIterator& fld::node::Tree::WIterator::operator++() {
   if (only_selected_) {
     do {
       type_ = type_->next;
@@ -78,7 +74,7 @@ Tree::WIterator& Tree::WIterator::operator++() {
 }
 
 
-Tree::Tree(Project &proj)
+fld::node::Tree::Tree(Project &proj)
 : proj_(proj)
 { (void)proj_; }
 
@@ -91,7 +87,7 @@ Tree::Tree(Project &proj)
  \param[in] uid any number between 0 and 65535
  \return the node with this uid, or 0 if not found
  */
-Node *Tree::find_by_uid(unsigned short uid) {
+Node *fld::node::Tree::find_by_uid(unsigned short uid) {
   for (Node *tp: all_nodes()) {
     if (tp->get_uid() == uid) return tp;
   }
@@ -105,7 +101,7 @@ Node *Tree::find_by_uid(unsigned short uid) {
  \param[in] crsr cursor position in text
  \return the node we found or 0
  */
-Node *Tree::find_in_text(int text_type, int crsr) {
+Node *fld::node::Tree::find_in_text(int text_type, int crsr) {
   for (Node *node: all_nodes()) {
     switch (text_type) {
       case 0: