Merge pull request xiaoyifang#1927 from xiaoyifang/opt/group-empty-name

opt: Group struct default constructor only invoked with empty string
BEST8OY · Nov 8, 2024 · dcc4579 · dcc4579
2 parents d3ad40f + 081cba6
commit dcc4579
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/instances.cc b/src/instances.cc
@@ -53,9 +53,8 @@ Group::Group( Config::Group const & cfgGroup,
   }
 }
 
-Group::Group( QString name_ ):
-  id( 0 ),
-  name( std::move( name_ ) )
+Group::Group():
+  id( 0 )
 {
 }
 

diff --git a/src/instances.hh b/src/instances.hh
@@ -32,7 +32,7 @@ struct Group
          Config::Group const & inactiveGroup );
 
   /// Creates an empty group.
-  explicit Group( QString name_ );
+  explicit Group();
 
   Group( unsigned id, QString name_ );
 

diff --git a/src/ui/groups_widgets.cc b/src/ui/groups_widgets.cc
@@ -122,7 +122,7 @@ void DictGroupWidget::groupIconActivated( int index )
 
 Config::Group DictGroupWidget::makeGroup() const
 {
-  Instances::Group g( "" );
+  Instances::Group g;
 
   g.id = groupId;
 

diff --git a/src/ui/orderandprops.cc b/src/ui/orderandprops.cc
@@ -135,7 +135,7 @@ OrderAndProps::OrderAndProps( QWidget * parent,
 
 Config::Group OrderAndProps::getCurrentDictionaryOrder() const
 {
-  Instances::Group g( "" );
+  Instances::Group g;
 
   g.dictionaries = ui.dictionaryOrder->getCurrentDictionaries();
 
@@ -144,7 +144,7 @@ Config::Group OrderAndProps::getCurrentDictionaryOrder() const
 
 Config::Group OrderAndProps::getCurrentInactiveDictionaries() const
 {
-  Instances::Group g( "" );
+  Instances::Group g;
 
   g.dictionaries = ui.inactiveDictionaries->getCurrentDictionaries();