summaryrefslogtreecommitdiffstats
path: root/include/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-03-10 17:11:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-03-10 21:41:24 +0100
commit5dcdb35ab1e99dbeb283d3694ab7ebba354e9197 (patch)
treecf58a8092a68f07e3d4392eb423a596940cdcbae /include/jvmfwk
parentManage JavaInfo instances via new/delete (diff)
downloadcore-5dcdb35ab1e99dbeb283d3694ab7ebba354e9197.tar.gz
core-5dcdb35ab1e99dbeb283d3694ab7ebba354e9197.zip
Turn JavaInfo rtl_uString* members into OUString
Change-Id: Ieb23b0c36ef56a4793a56cdb450df34e4d9bce1d
Diffstat (limited to 'include/jvmfwk')
-rw-r--r--include/jvmfwk/framework.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 6ee43200d983..0380e1f68f7e 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -24,6 +24,7 @@
#include <jvmfwk/jvmfwkdllapi.hxx>
#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
#include <osl/mutex.h>
#include "jni.h"
@@ -219,10 +220,10 @@ struct JavaInfo
Java system property <code>java.vendor</code>.
</p>
*/
- rtl_uString *sVendor;
+ OUString sVendor;
/** contains the file URL to the installation directory.
*/
- rtl_uString *sLocation;
+ OUString sLocation;
/** contains the version of this Java distribution.
<p>The version string must adhere to the rules
@@ -231,7 +232,7 @@ struct JavaInfo
equal the Java system property <code>java.version</code>.
</p>
*/
- rtl_uString *sVersion;
+ OUString sVersion;
/** indicates supported special features.
<p>For example, <code>JFW_FEATURE_ACCESSBRIDGE</code> indicates that
@@ -268,9 +269,8 @@ JVMFWK_DLLPUBLIC void jfw_freeJavaInfo(JavaInfo *pInfo);
<p>Two <code>JavaInfo</code> objects are said to be equal if the contained
members of the first <code>JavaInfo</code> are equal to their counterparts
in the second <code>JavaInfo</code> object. The equality of the
- <code>rtl_uString</code> members is determined
- by the respective comparison function (see
- <code>OUString::equals</code>).
+ <code>OUString</code> members is determined
+ by <code>operator ==</code>.
Similarly the equality of the <code>sal_Sequence</code> is
also determined by a comparison
function (see <code>rtl::ByteSequence::operator ==</code>). </p>