diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2011-03-02 21:53:12 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2011-03-02 21:53:12 +0100 |
commit | 933e22880b2d5d9c6dd6e3e05c30d6f0ced55508 (patch) | |
tree | 24b423cb78e10cb8435e778b34ca6d3a3b22ae4c /jvmfwk | |
parent | avoid implicit cast (diff) | |
download | core-933e22880b2d5d9c6dd6e3e05c30d6f0ced55508.tar.gz core-933e22880b2d5d9c6dd6e3e05c30d6f0ced55508.zip |
Remove "using namespace ::rtl"
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 5 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 3 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 4 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 5 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 6 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 7 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 3 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 6 | ||||
-rw-r--r-- | jvmfwk/source/fwkbase.cxx | 7 | ||||
-rw-r--r-- | jvmfwk/source/fwkutil.cxx | 5 |
11 files changed, 41 insertions, 14 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 2c13780ad421..395f386d1939 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -39,8 +39,9 @@ #include "rtl/byteseq.hxx" #include "jvmfwk/framework.h" -using namespace rtl; - +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; #define OUSTR(x) OUString(RTL_CONSTASCII_USTRINGPARAM( x )) static sal_Bool hasOption(char const * szOption, int argc, char** argv); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 822f2eb5f032..933e3d19e1d5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -34,9 +34,10 @@ #include "gnujre.hxx" #include "util.hxx" -using namespace rtl; using namespace std; using namespace osl; +using ::rtl::OUString; +using ::rtl::Reference; namespace jfw_plugin { diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 9da3df2a2fdc..1fd28a18e603 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -32,10 +32,10 @@ #include "osl/thread.h" #include "otherjre.hxx" -using namespace rtl; using namespace std; - +using ::rtl::OUString; +using ::rtl::Reference; namespace jfw_plugin { diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index cfc729d42959..eaaaf3a35aff 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -66,10 +66,13 @@ #define SUN_MICRO "Sun Microsystems Inc." using namespace osl; -using namespace rtl; using namespace std; using namespace jfw_plugin; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OString; + namespace { struct PluginMutex: public ::rtl::Static<osl::Mutex, PluginMutex> {}; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index a2e0c1d997d1..56cb5c7bd7e7 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -34,9 +34,11 @@ #include "sunversion.hxx" #include "diagnostics.h" -using namespace rtl; using namespace std; +using ::rtl::OUString; +using ::rtl::Reference; + #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) namespace jfw_plugin { diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 53051c905d41..5bc76c26f421 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -36,12 +36,14 @@ #include <string.h> #include <ctype.h> #include "diagnostics.h" -using namespace rtl; using namespace osl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; namespace jfw_plugin { //stoc_javadetect -//extern OUString ::Impl::usPathDelim(); #define OUSTR( x ) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) #if OSL_DEBUG_LEVEL >= 2 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index c423fa7d60af..e208d43bb400 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -59,10 +59,15 @@ #include "sunjre.hxx" #include "vendorlist.hxx" #include "diagnostics.h" -using namespace rtl; using namespace osl; using namespace std; +using ::rtl::OUString; +using ::rtl::Reference; +using ::rtl::OString; +using ::rtl::OUStringBuffer; +using ::rtl::OUStringToOString; + #define CHAR_POINTER(oustr) ::rtl::OUStringToOString(oustr,RTL_TEXTENCODING_UTF8).pData->buffer #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #ifdef WNT diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index f4e6ecfa9735..9025266571fd 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -36,9 +36,10 @@ #include "sunjre.hxx" using namespace std; -using namespace rtl; using namespace osl; +using ::rtl::OUString; + namespace jfw_plugin { rtl::Reference<VendorBase> createInstance(createInstance_func pFunc, diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 44bfeed7c9bc..f24b6ff166e4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -37,7 +37,11 @@ #include <stdio.h> using namespace com::sun::star::uno; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; +using ::rtl::OString; namespace jfw_plugin { diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index aab2201ee07d..e6856747f348 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -42,7 +42,12 @@ #include "fwkbase.hxx" using namespace osl; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OString; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; #define JAVASETTINGS "javasettings" #define JAVASETTINGS_XML "javasettings.xml" #define VENDORSETTINGS "javavendors.xml" diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 63402bef98d4..3b73534e129e 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -58,9 +58,12 @@ #include "framework.hxx" #include "fwkutil.hxx" -using namespace rtl; using namespace osl; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; + namespace jfw { |