Remove "using namespace ::rtl"

7 files changed, 18 insertions, 10 deletions

diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 6d4cc9a94e3e..69cffead8372 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -43,11 +43,11 @@
 
 #include "reflcnst.hxx"
 
-using namespace rtl;
+using ::rtl::OString;
+
 
 namespace {
 
-// Throws std::bad_alloc:
 inline rtl::OString toByteString(rtl_uString const * str) {
     return rtl::OString(
         str->buffer, str->length, RTL_TEXTENCODING_UTF8,
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index e43f8054d32b..0976c23555c7 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -61,10 +61,14 @@
 #include    <rtl/ustrbuf.hxx>
 #include    <osl/file.hxx>
 
-using namespace rtl;
 using namespace osl;
 using namespace store;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+
 namespace {
 
 void printString(rtl::OUString const & s) {
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 64e0cc8c401f..80b6470704c5 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -62,9 +62,6 @@
 #define REG_GUARD(mutex) \
     osl::Guard< osl::Mutex > aGuard( mutex );
 
-// @@@ using namespace rtl;
-// @@@ using namespace osl;
-
 class ORegKey;
 class RegistryTypeReader;
 
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index 8997b247189c..d91117be2be3 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -42,7 +42,8 @@
 
 
 using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 sal_Int32 lValue1   = 123456789;
 sal_Int32 lValue2   = 54321;
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index 283eb4b253e5..427f5428be7d 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -41,7 +41,10 @@
 #include <rtl/ustring.hxx>
 
 using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
 
 void test_coreReflection()
 {
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index db400a73729b..584fac277d85 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -103,7 +103,8 @@ protected:
 };
 #endif
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
 #if (defined UNX) || (defined OS2)
 int main( int argc, char * argv[] )
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index b2ed50070d72..fb45c62e2a20 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -37,7 +37,9 @@
 #include    <rtl/alloc.h>
 
 using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
 #if (defined UNX) || (defined OS2)
 int main()