diff options
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 41ba8b2e27a8..933e3d19e1d5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,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 { @@ -103,7 +105,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) bool bAccess = false; typedef vector<pair<OUString, OUString> >::const_iterator it_prop; - for (it_prop i = props.begin(); i != props.end(); i++) + for (it_prop i = props.begin(); i != props.end(); ++i) { if(! bVendor && sVendorProperty.equals(i->first)) { @@ -170,7 +172,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) bool bRt = false; typedef vector<OUString>::const_iterator i_path; - for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++) + for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip) { //Construct an absolute path to the possible runtime OUString usRt= m_sHome + *ip; @@ -187,7 +189,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) if (!bRt) { m_sHome = m_sJavaHome; - for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++) + for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip) { //Construct an absolute path to the possible runtime OUString usRt= m_sHome + *ip; @@ -206,7 +208,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) if (!bRt && m_sJavaHome != sJavaLibraryPath) { m_sHome = sJavaLibraryPath; - for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++) + for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip) { //Construct an absolute path to the possible runtime OUString usRt= m_sHome + *ip; @@ -226,7 +228,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) if (!bRt && m_sJavaHome != rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"))) { m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib64")); - for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++) + for(i_path ip = libpaths.begin(); ip != libpaths.end(); ++ip) { //Construct an absolute path to the possible runtime OUString usRt= m_sHome + *ip; @@ -255,7 +257,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props) OUString sPathSep= OUString::createFromAscii(arSep); bool bLdPath = true; int c = 0; - for(i_path il = ld_paths.begin(); il != ld_paths.end(); il ++, c++) + for(i_path il = ld_paths.begin(); il != ld_paths.end(); ++il, ++c) { OUString usAbsUrl= m_sHome + *il; // convert to system path @@ -285,3 +287,5 @@ int GnuInfo::compareVersions(const rtl::OUString&) const } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |