diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-11 11:29:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-11 13:50:50 +0200 |
| commit | 7ca4ea54b4d610104df1b88ae5b04c2081a4a429 (patch) | |
| tree | ca6be37362fcdf1368b087fd3787f17745326801 /jvmfwk | |
| parent | 59010ca14ba07f0a1d6f662bb1f8fbad33f3c654 (diff) | |
clang-tidy modernize-use-emplace in hwpfilter..lotuswordpro
Change-Id: Ic11634ca28396fd156390c511087bae03bd5fb70
Reviewed-on: https://gerrit.libreoffice.org/42156
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 9 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/source/framework.cxx | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 457c613f7db6..b435aa846669 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -721,7 +721,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( // JNI_CreateJavaVM. This happens when the LD_LIBRARY_PATH does not contain // all some directories of the Java installation. This is necessary for // all versions below 1.5.1 - options.push_back(Option("abort", reinterpret_cast<void*>(abort_handler))); + options.emplace_back("abort", reinterpret_cast<void*>(abort_handler)); bool hasStackSize = false; for (int i = 0; i < cOptions; i++) { @@ -742,10 +742,10 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( if (opt.startsWith("-Xss")) { hasStackSize = true; } - options.push_back(Option(opt, arOptions[i].extraInfo)); + options.emplace_back(opt, arOptions[i].extraInfo); } if (addForceInterpreted) { - options.push_back(Option("-Xint", nullptr)); + options.emplace_back("-Xint", nullptr); } if (!hasStackSize) { #if defined LINUX && (defined X86 || defined X86_64) @@ -771,8 +771,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( "jfw", "huge RLIMIT_STACK " << l.rlim_cur << " -> 8192K"); l.rlim_cur = 8192 * 1024; } - options.push_back( - Option("-Xss" + OString::number(l.rlim_cur), nullptr)); + options.emplace_back("-Xss" + OString::number(l.rlim_cur), nullptr); } else { int e = errno; SAL_WARN("jfw", "getrlimit(RLIMIT_STACK) failed with errno " << e); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index f01c38c45cf1..798fae528bb6 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -524,7 +524,7 @@ bool getJavaProps(const OUString & exePath, } #endif - props.push_back(std::make_pair(sKey, sVal)); + props.emplace_back(sKey, sVal); } if (rs != FileHandleReader::RESULT_ERROR && !props.empty()) diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 4fe4d48ccff3..c03a3cac30e3 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -349,8 +349,7 @@ javaFrameworkError jfw_findAndSelectJRE(std::unique_ptr<JavaInfo> *pInfo) jfw::VersionInfo versionInfo = aVendorSettings.getVersionInformation(vendor); - versionInfos.push_back( - std::pair<OUString, jfw::VersionInfo>(vendor, versionInfo)); + versionInfos.emplace_back(vendor, versionInfo); } std::vector<rtl::Reference<jfw_plugin::VendorBase>> infos; |