diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-11-01 11:11:09 +0100 |
|---|---|---|
| committer | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-11-01 13:33:41 +0000 |
| commit | acf531be6a423f9b74997b29a8cafe82aa18423c (patch) | |
| tree | 1ff5e8f8df12ab1bbf89db930bd562268af3a7c6 /ucb | |
| parent | 9e33ac4035442b48bcd2a58f42a279fe9855b6ce (diff) | |
Cosmetic: Namespaces, better make use of the 'using-directive'
Change-Id: If27709a2d8d8f231be9be0231d522f2a71e5fcae
Reviewed-on: https://gerrit.libreoffice.org/30457
Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Tested-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/qa/cppunit/webdav/webdav_local_neon.cxx | 3 | ||||
| -rw-r--r-- | ucb/qa/cppunit/webdav/webdav_options.cxx | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx index b509229cb853..cbe0e0787f70 100644 --- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx +++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx @@ -12,6 +12,7 @@ #include <cppunit/plugin/TestPlugIn.h> #include "NeonUri.hxx" +using namespace webdav_ucp; namespace { @@ -35,7 +36,7 @@ namespace { //try URL decomposition OUString aURL( "http://user%40anothername@server.biz:8040/aService/asegment/nextsegment/check.this?test=true&link=http://anotherserver.com/%3Fcheck=theapplication%26os=linuxintel%26lang=en-US%26version=5.2.0" ); - webdav_ucp::NeonUri aURI( aURL ); + NeonUri aURI( aURL ); CPPUNIT_ASSERT_EQUAL( OUString( "http" ), aURI.GetScheme() ); CPPUNIT_ASSERT_EQUAL( OUString( "server.biz" ), aURI.GetHost() ); CPPUNIT_ASSERT_EQUAL( OUString( "user%40anothername" ), aURI.GetUserInfo() ); diff --git a/ucb/qa/cppunit/webdav/webdav_options.cxx b/ucb/qa/cppunit/webdav/webdav_options.cxx index 9bdc1c5a93d7..709e2bcb8ad0 100644 --- a/ucb/qa/cppunit/webdav/webdav_options.cxx +++ b/ucb/qa/cppunit/webdav/webdav_options.cxx @@ -13,6 +13,8 @@ #include "DAVException.hxx" #include "DAVTypes.hxx" +using namespace webdav_ucp; + namespace { @@ -27,7 +29,7 @@ namespace void tearDown( ) override; - void DAVTypesCheckInit( webdav_ucp::DAVOptions const & aDavType ); + void DAVTypesCheckInit( DAVOptions const & aDavType ); void DAVTypesTest(); void DAVOptsCacheTests(); @@ -51,7 +53,7 @@ namespace { } - void webdav_opts_test::DAVTypesCheckInit( webdav_ucp::DAVOptions const & aDavType ) + void webdav_opts_test::DAVTypesCheckInit( DAVOptions const & aDavType ) { // check if the class is at reset state // using accessors @@ -73,7 +75,7 @@ namespace void webdav_opts_test::DAVTypesTest() { //our DAVOptions - webdav_ucp::DAVOptions aDavOpt; + DAVOptions aDavOpt; DAVTypesCheckInit( aDavOpt ); aDavOpt.setClass1(); @@ -275,7 +277,7 @@ namespace aDavOpt.init(); DAVTypesCheckInit( aDavOpt ); // equality check - webdav_ucp::DAVOptions aDavOptTarget; + DAVOptions aDavOptTarget; CPPUNIT_ASSERT_EQUAL( true , aDavOpt == aDavOptTarget ); aDavOpt.setClass1(); @@ -341,11 +343,11 @@ namespace void webdav_opts_test::DAVOptsCacheTests() { // define a local cache to test - webdav_ucp::DAVOptionsCache aDAVOptsCache; + DAVOptionsCache aDAVOptsCache; // the value to cache - webdav_ucp::DAVOptions aDavOpt; + DAVOptions aDavOpt; // the returned value to test - webdav_ucp::DAVOptions aDavOptCached; + DAVOptions aDavOptCached; // init the values OUString aAllowedMethods = "OPTIONS,GET,HEAD,POST,DELETE,TRACE,PROPFIND,PROPPATCH,COPY,MOVE,PUT,LOCK,UNLOCK"; OUString aURL = "http://my.server.org/a%20fake%20url/to%20test/another-url"; |