summaryrefslogtreecommitdiffstats
path: root/src/libnr/nr-scale-test.h
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2008-12-08 07:15:15 +0000
committerjoncruz <joncruz@users.sourceforge.net>2008-12-08 07:15:15 +0000
commitbb672c6aad453833c8e76028668b70c14bfb4ba3 (patch)
tree93451c6b9a71caa1171597b306eb7c27f58a989d /src/libnr/nr-scale-test.h
parentPartial fix for "make check" compilation failure. (diff)
downloadinkscape-bb672c6aad453833c8e76028668b70c14bfb4ba3.tar.gz
inkscape-bb672c6aad453833c8e76028668b70c14bfb4ba3.zip
Warning and 'using' cleanup.
(bzr r6970)
Diffstat (limited to 'src/libnr/nr-scale-test.h')
-rw-r--r--src/libnr/nr-scale-test.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libnr/nr-scale-test.h b/src/libnr/nr-scale-test.h
index dc5e6ef28..938e8e14d 100644
--- a/src/libnr/nr-scale-test.h
+++ b/src/libnr/nr-scale-test.h
@@ -2,8 +2,6 @@
#include <libnr/nr-scale.h>
#include <libnr/nr-scale-ops.h>
-using NR::X;
-using NR::Y;
class NrScaleTest : public CxxTest::TestSuite
{
@@ -30,8 +28,8 @@ public:
void testXY_CtorArrayOperator(void)
{
- TS_ASSERT_EQUALS( sa[X], 1.5 );
- TS_ASSERT_EQUALS( sa[Y], 2.0 );
+ TS_ASSERT_EQUALS( sa[NR::X], 1.5 );
+ TS_ASSERT_EQUALS( sa[NR::Y], 2.0 );
TS_ASSERT_EQUALS( sa[0u], 1.5 );
TS_ASSERT_EQUALS( sa[1u], 2.0 );
}
@@ -54,8 +52,8 @@ public:
void testPointCtor(void)
{
- TS_ASSERT_EQUALS( sb[X], b[X] );
- TS_ASSERT_EQUALS( sb[Y], b[Y] );
+ TS_ASSERT_EQUALS( sb[NR::X], b[NR::X] );
+ TS_ASSERT_EQUALS( sb[NR::Y], b[NR::Y] );
}
void testOpStarPointScale(void)