diff --git a/Sources/tools/Display/Display.cpp b/Sources/tools/Display/Display.cpp index 1bc552d..87d37b0 100644 --- a/Sources/tools/Display/Display.cpp +++ b/Sources/tools/Display/Display.cpp @@ -168,11 +168,11 @@ DrawerManager::DrawerManager(GtkWidget * widget, int32_t x, int32_t y) // http://cairographics.org/FAQ/#clear_a_surface // http://gtk.developpez.com/faq/?page=gtkwidget#GTK_WIDGET_transparent - cairo_set_source_rgba(m_cairo, 1, 1, 1, 0); - cairo_set_operator(m_cairo, CAIRO_OPERATOR_SOURCE); + //cairo_set_source_rgba(m_cairo, 1, 1, 1, 0); + //cairo_set_operator(m_cairo, CAIRO_OPERATOR_SOURCE); //cairo_paint(m_cairo); //cairo_fill(m_cairo); - cairo_stroke (m_cairo); + //cairo_stroke (m_cairo); diff --git a/Sources/tools/NameSpaceEdn/Edn.h b/Sources/tools/NameSpaceEdn/Edn.h index 44630c5..08b27bc 100644 --- a/Sources/tools/NameSpaceEdn/Edn.h +++ b/Sources/tools/NameSpaceEdn/Edn.h @@ -26,7 +26,7 @@ #include "tools_debug.h" #include "toolsMemory.h" -#include "Vector.h" +//#include "Vector.h" // TODO : Set the vector of edn enable #include "VectorType.h" diff --git a/Sources/tools/NameSpaceEdn/Vector.h b/Sources/tools/NameSpaceEdn/Vector.h index 0673c6c..b6cb22e 100644 --- a/Sources/tools/NameSpaceEdn/Vector.h +++ b/Sources/tools/NameSpaceEdn/Vector.h @@ -65,10 +65,10 @@ namespace Edn { -template class Vector: +template class Vector { public: - class Iterator: + class Iterator { // Private data : private: @@ -207,13 +207,13 @@ template class Vector: * @return --- * */ - Iterator(EdnVector * EdnVector, int pos): + Iterator(Edn::Vector * myVector, int pos): m_current(pos), - m_EdnVector(EdnVector) + m_Vector(myVector) { // nothing to do ... } - friend class EdnVector; + friend class Edn::Vector; }; /** @@ -224,7 +224,7 @@ template class Vector: * @return --- * */ - EdnVector(int count = 0): + Vector(int count = 0): m_data(NULL), m_count(0), m_size(0) @@ -240,15 +240,15 @@ template class Vector: * @return --- * */ - EdnVector(const EdnVector & EdnVector): - m_size(EdnVector.m_size), - m_count(EdnVector.m_count), + Vector(const Edn::Vector & myVector): + m_size(myVector.m_size), + m_count(myVector.m_count), m_data(NULL) { int32_t i; EDN_MALLOC_CAST(m_data, m_size, T, reinterpret_cast); for(i=0; i class Vector: * @return --- * */ - ~EdnVector() + ~Vector() { Destroy(); } @@ -273,7 +273,7 @@ template class Vector: * @return --- * */ - EdnVector& operator=(const EdnVector & EdnVector) + Vector& operator=(const Edn::Vector & EdnVector) { int32_t i; this->~EdnVector();