Warning and 'using' cleanup.

(bzr r6970)

1 files changed, 31 insertions, 33 deletions

diff --git a/src/util/list-container-test.h b/src/util/list-container-test.h
index 08e7cfa41..c2db79fee 100644
--- a/src/util/list-container-test.h
+++ b/src/util/list-container-test.h
@@ -3,15 +3,13 @@
 #include <stdarg.h>
 #include "util/list-container.h"
 
-using Inkscape::Util::ListContainer;
-
 #define ARRAY_RANGE(array) (array), (array)+sizeof((array))/sizeof((array)[0])
 
-static bool check_values(ListContainer<int> const &c, unsigned n_values, ...) {
+static bool check_values(Inkscape::Util::ListContainer<int> const &c, unsigned n_values, ...) {
     bool ret = true;
     va_list args;
     va_start(args, n_values);
-    ListContainer<int>::const_iterator iter(c.begin());
+    Inkscape::Util::ListContainer<int>::const_iterator iter(c.begin());
     while ( n_values && iter != c.end() ) {
         int const value = va_arg(args, int);
         if ( value != *iter ) {
@@ -44,9 +42,9 @@ public:
     {
         int const values[]={1,2,3,4};
         int const * const values_end=values+4;
-        ListContainer<int> container(values, values_end);
+        Inkscape::Util::ListContainer<int> container(values, values_end);
 
-        ListContainer<int>::iterator container_iter=container.begin();
+        Inkscape::Util::ListContainer<int>::iterator container_iter=container.begin();
         int const * values_iter=values;
 
         while ( values_iter != values_end && container_iter != container.end() ) {
@@ -65,10 +63,10 @@ public:
         int const b[] = { 1, 2, 3, 4 };
         int const c[] = { 1, 2, 3 };
         int const d[] = { 1, 2, 3, 5 };
-        ListContainer<int> c_a(ARRAY_RANGE(a));
-        ListContainer<int> c_b(ARRAY_RANGE(b));
-        ListContainer<int> c_c(ARRAY_RANGE(c));
-        ListContainer<int> c_d(ARRAY_RANGE(d));
+        Inkscape::Util::ListContainer<int> c_a(ARRAY_RANGE(a));
+        Inkscape::Util::ListContainer<int> c_b(ARRAY_RANGE(b));
+        Inkscape::Util::ListContainer<int> c_c(ARRAY_RANGE(c));
+        Inkscape::Util::ListContainer<int> c_d(ARRAY_RANGE(d));
 
         TS_ASSERT(c_a == c_b);
         TS_ASSERT(!( c_a != c_b ));
@@ -84,10 +82,10 @@ public:
         int const b[] = { 1, 2, 2, 4 };
         int const c[] = { 1, 2, 4, 4 };
         int const d[] = { 1, 2, 3 };
-        ListContainer<int> c_a(ARRAY_RANGE(a));
-        ListContainer<int> c_b(ARRAY_RANGE(b));
-        ListContainer<int> c_c(ARRAY_RANGE(c));
-        ListContainer<int> c_d(ARRAY_RANGE(d));
+        Inkscape::Util::ListContainer<int> c_a(ARRAY_RANGE(a));
+        Inkscape::Util::ListContainer<int> c_b(ARRAY_RANGE(b));
+        Inkscape::Util::ListContainer<int> c_c(ARRAY_RANGE(c));
+        Inkscape::Util::ListContainer<int> c_d(ARRAY_RANGE(d));
         TS_ASSERT(c_a >= c_b);
         TS_ASSERT(!( c_a < c_b ));
         TS_ASSERT(!( c_a >= c_c ));
@@ -100,8 +98,8 @@ public:
     void testAssignmentOperator()
     {
         int const a[] = { 1, 2, 3, 4 };
-        ListContainer<int> c_a(ARRAY_RANGE(a));
-        ListContainer<int> c_c;
+        Inkscape::Util::ListContainer<int> c_a(ARRAY_RANGE(a));
+        Inkscape::Util::ListContainer<int> c_c;
         TS_ASSERT(c_a != c_c);
         c_c = c_a;
         TS_ASSERT(c_a == c_c);
@@ -111,26 +109,26 @@ public:
 
     void testFillConstructor()
     {
-        ListContainer<int> filled((std::size_t)3, 2);
+        Inkscape::Util::ListContainer<int> filled((std::size_t)3, 2);
         TS_ASSERT(check_values(filled, 3, 2, 2, 2));
     }
 
     void testContainerSize()
     {
-        ListContainer<int> empty;
+        Inkscape::Util::ListContainer<int> empty;
         TS_ASSERT(empty.empty());
-        TS_ASSERT_EQUALS(empty.size() , 0);
+        TS_ASSERT_EQUALS(static_cast<int>(empty.size()), 0);
         int const a[] = { 1, 2, 3 };
-        ListContainer<int> c_a(ARRAY_RANGE(a));
+        Inkscape::Util::ListContainer<int> c_a(ARRAY_RANGE(a));
         TS_ASSERT(!c_a.empty());
-        TS_ASSERT_EQUALS(c_a.size() , 3);
+        TS_ASSERT_EQUALS(static_cast<int>(c_a.size()), 3);
 
-        TS_ASSERT_LESS_THAN(0 , empty.max_size());
+        TS_ASSERT_LESS_THAN(0, static_cast<int>(empty.max_size()));
     }
 
     void testAppending()
     {
-        ListContainer<int> c;
+        Inkscape::Util::ListContainer<int> c;
         c.push_back(1);
         TS_ASSERT(check_values(c, 1, 1));
         c.push_back(2);
@@ -143,15 +141,15 @@ public:
     {
         int const a[] = { 1, 2, 3, 4 };
         int const b[] = { 5, 6, 7 };
-        ListContainer<int> c_a(ARRAY_RANGE(a));
-        ListContainer<int> c_b(ARRAY_RANGE(b));
+        Inkscape::Util::ListContainer<int> c_a(ARRAY_RANGE(a));
+        Inkscape::Util::ListContainer<int> c_b(ARRAY_RANGE(b));
         c_a.insert(c_a.end(), c_b.begin(), c_b.end());
         TS_ASSERT(check_values(c_a, 7, 1, 2, 3, 4, 5, 6, 7));
     }
 
     void testPrepending()
     {
-        ListContainer<int> c;
+        Inkscape::Util::ListContainer<int> c;
         c.push_front(1);
         TS_ASSERT(check_values(c, 1, 1));
         c.push_front(2);
@@ -162,7 +160,7 @@ public:
 
     void testSingleValueInsertion()
     {
-        ListContainer<int> c;
+        Inkscape::Util::ListContainer<int> c;
 
         c.insert(c.begin(), 1);
         TS_ASSERT(check_values(c, 1, 1));
@@ -173,7 +171,7 @@ public:
         c.insert(c.begin(), 3);
         TS_ASSERT(check_values(c, 3, 3, 1, 2));
 
-        ListContainer<int>::iterator pos=c.begin();
+        Inkscape::Util::ListContainer<int>::iterator pos=c.begin();
         ++pos;
         c.insert(pos, 4);
         TS_ASSERT(check_values(c, 4, 3, 4, 1, 2));
@@ -182,12 +180,12 @@ public:
     void testSingleValueErasure()
     {
         int const values[] = { 1, 2, 3, 4 };
-        ListContainer<int> c(ARRAY_RANGE(values));
+        Inkscape::Util::ListContainer<int> c(ARRAY_RANGE(values));
 
         c.erase(c.begin());
         TS_ASSERT(check_values(c, 3, 2, 3, 4));
 
-        ListContainer<int>::iterator pos=c.begin();
+        Inkscape::Util::ListContainer<int>::iterator pos=c.begin();
         ++pos;
         c.erase(pos);
         TS_ASSERT(check_values(c, 2, 2, 4));
@@ -204,7 +202,7 @@ public:
     void testPopFront()
     {
         int const full_ary[] = { 1, 2, 3 };
-        ListContainer<int> t(ARRAY_RANGE(full_ary));
+        Inkscape::Util::ListContainer<int> t(ARRAY_RANGE(full_ary));
         TS_ASSERT(check_values(t, 3,  1, 2, 3));
         TS_ASSERT_EQUALS(t.back() , 3);
         t.pop_front();
@@ -230,8 +228,8 @@ public:
     {
         int const full_ary[] = { 1, 2, 3, 4 };
         int const exp_ary[] = { 1, 3, 4 };
-        ListContainer<int> full_list(ARRAY_RANGE(full_ary));
-        ListContainer<int> exp_list(ARRAY_RANGE(exp_ary));
+        Inkscape::Util::ListContainer<int> full_list(ARRAY_RANGE(full_ary));
+        Inkscape::Util::ListContainer<int> exp_list(ARRAY_RANGE(exp_ary));
         TS_ASSERT(full_list != exp_list);
         full_list.erase_after(full_list.begin());
         TS_ASSERT(full_list == exp_list);