ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

rustmaker: Use more string_view params, address loplugin:unnecessarygetstr

Browse Source 
Switch some params from const std::string& to std::string_view
and drop the then unnecessery calls to OString::getStr in
callers.

This fixes the following clang plugin errors seen in an
--enable-rust-uno build:

    /home/michi/development/git/libreoffice/codemaker/source/rustmaker/cpproduce.cxx:1070:88: error: unnecessary call to 'getStr' when passing to string constructor [loplugin:unnecessarygetstr]
     1070 |     generateStructSourceBasicFunctions(file, functionPrefix, handleTypeName, className.getStr());
          |                                                                              ~~~~~~~~~~^~~~~~~~
    /home/michi/development/git/libreoffice/codemaker/source/rustmaker/cpproduce.cxx:1073:85: error: unnecessary call to 'getStr' when passing to string constructor [loplugin:unnecessarygetstr]
     1073 |     generateStructSourceBaseMembers(file, functionPrefix, handleTypeName, className.getStr(),
          |                                                                           ~~~~~~~~~~^~~~~~~~
    /home/michi/development/git/libreoffice/codemaker/source/rustmaker/cpproduce.cxx:1077:87: error: unnecessary call to 'getStr' when passing to string constructor [loplugin:unnecessarygetstr]
     1077 |     generateStructSourceDirectMembers(file, functionPrefix, handleTypeName, className.getStr(),
          |                                                                             ~~~~~~~~~~^~~~~~~~

Change-Id: Ia0ad68dd2dfed3a9b807c284e474ae0f2e42b2b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190853
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2025-09-12 13:57:10 +02:00
parent 292f5fe5d5
commit 5ecb0b6f95
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codemaker/source/rustmaker/cpproduce.cxx
+7 -9
View File
@@ -826,7 +826,7 @@ void CppProducer::generateStructSourceNamespaces(CppFile& file, std::string_view
void CppProducer::generateStructSourceBasicFunctions(CppFile& file, std::string_view functionPrefix,
std::string_view handleTypeName,
const std::string& className)
std::string_view className)
{
// Generate struct creation function
file.beginLine()
@@ -913,7 +913,7 @@ void CppProducer::generateStructSourceBasicFunctions(CppFile& file, std::string_
void CppProducer::generateStructSourceBaseMembers(
CppFile& file, std::string_view functionPrefix, std::string_view handleTypeName,
const std::string& className, const rtl::Reference<unoidl::PlainStructTypeEntity>& entity)
std::string_view className, const rtl::Reference<unoidl::PlainStructTypeEntity>& entity)
{
// Generate getters/setters for base type members (if struct has a base)
if (!entity->getDirectBase().isEmpty())
@@ -945,7 +945,7 @@ void CppProducer::generateStructSourceBaseMembers(
void CppProducer::generateStructSourceDirectMembers(
CppFile& file, std::string_view functionPrefix, std::string_view handleTypeName,
const std::string& className, const rtl::Reference<unoidl::PlainStructTypeEntity>& entity)
std::string_view className, const rtl::Reference<unoidl::PlainStructTypeEntity>& entity)
{
// Generate getters/setters for direct struct members
file.beginLine().append("// Getters/setters for direct struct members").endLine();
@@ -958,7 +958,7 @@ void CppProducer::generateStructSourceDirectMembers(
void CppProducer::generateStructMemberAccessors(CppFile& file, std::string_view functionPrefix,
std::string_view handleTypeName,
const std::string& className,
std::string_view className,
const unoidl::PlainStructTypeEntity::Member& member)
{
// Generate getter implementation
@@ -1067,15 +1067,13 @@ void CppProducer::generateStructSource(std::string_view name,
file.beginLine().append("extern \"C\"").endLine().beginBlock();
// Generate basic functions (creation/destruction)
generateStructSourceBasicFunctions(file, functionPrefix, handleTypeName, className.getStr());
generateStructSourceBasicFunctions(file, functionPrefix, handleTypeName, className);
// Generate accessors for base type members
generateStructSourceBaseMembers(file, functionPrefix, handleTypeName, className.getStr(),
entity);
generateStructSourceBaseMembers(file, functionPrefix, handleTypeName, className, entity);
// Generate accessors for direct members
generateStructSourceDirectMembers(file, functionPrefix, handleTypeName, className.getStr(),
entity);
generateStructSourceDirectMembers(file, functionPrefix, handleTypeName, className, entity);
file.endBlock().append(" // extern \"C\"").endLine();
codemaker/source/rustmaker/cpproduce.hxx
+4 -5
View File
@@ -205,18 +205,17 @@ private:
// Struct generation helpers
static void generateStructSourceBasicFunctions(CppFile& file, std::string_view functionPrefix,
std::string_view handleTypeName,
const std::string& className);
std::string_view className);
void
generateStructSourceBaseMembers(CppFile& file, std::string_view functionPrefix,
std::string_view handleTypeName, const std::string& className,
std::string_view handleTypeName, std::string_view className,
const rtl::Reference<unoidl::PlainStructTypeEntity>& entity);
void
generateStructSourceDirectMembers(CppFile& file, std::string_view functionPrefix,
std::string_view handleTypeName, const std::string& className,
std::string_view handleTypeName, std::string_view className,
const rtl::Reference<unoidl::PlainStructTypeEntity>& entity);
void generateStructMemberAccessors(CppFile& file, std::string_view functionPrefix,
std::string_view handleTypeName,
const std::string& className,
std::string_view handleTypeName, std::string_view className,
const unoidl::PlainStructTypeEntity::Member& member);
// ========================================================================