diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-08-13 11:35:38 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-13 15:57:27 +0100 |
| commit | f57d0649b913f0192ed90de4082ff449f1f7083b (patch) | |
| tree | a04c702ab421cf0be5bffe8bfd1be352dc872e35 /jvmfwk/plugins/sunmajor/pluginlib | |
| parent | e554121fcabefa01b531c1b5b63c227f5a9a97fa (diff) | |
misc. cleanup.
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 9e40e8a37d3b..6c2bc0f6d82d 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -25,14 +25,11 @@ using namespace std; -using ::rtl::OUString; -using ::rtl::Reference; - #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) namespace jfw_plugin { -Reference<VendorBase> SunInfo::createInstance() +rtl::Reference<VendorBase> SunInfo::createInstance() { return new SunInfo; } @@ -50,7 +47,7 @@ char const* const* SunInfo::getJavaExePaths(int * size) "jre/bin/java" #endif }; - *size = SAL_N_ELEMENTS(ar); + *size = SAL_N_ELEMENTS(ar); return ar; } @@ -68,7 +65,6 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" #endif - }; *size = SAL_N_ELEMENTS(ar); return ar; @@ -78,12 +74,10 @@ char const* const* SunInfo::getLibraryPaths(int* size) { #ifdef UNX static char const * ar[] = { - "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/server", "/lib/" JFW_PLUGIN_ARCH "/native_threads", "/lib/" JFW_PLUGIN_ARCH - }; *size = SAL_N_ELEMENTS(ar); return ar; @@ -95,7 +89,7 @@ char const* const* SunInfo::getLibraryPaths(int* size) int SunInfo::compareVersions(const rtl::OUString& sSecond) const { - OUString sFirst = getVersion(); + rtl::OUString sFirst = getVersion(); SunVersion version1(sFirst); JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION @@ -105,9 +99,9 @@ int SunInfo::compareVersions(const rtl::OUString& sSecond) const if ( ! version2) throw MalformedVersionException(); - if(version1 == version2) + if (version1 == version2) return 0; - if(version1 > version2) + if (version1 > version2) return 1; else return -1; |