opt: favorite existence check logic rewrite

src/common/globalbroadcaster.hh

@@ -39,8 +39,9 @@ public:
   QString translateLineText{};
   //hold the dictionary id;
   QSet< QString > collapsedDicts;
-  QMap< QString, QSet< QString > > folderFavoritesMap;
-  QMap< unsigned, QString > groupFolderMap;
+  QSet< QString > favoriteWords;
+  //map group id to favorite folder
+  QMap< unsigned, QString > groupFavoriteMap;
   PronounceEngine pronounce_engine;
   QString getAbbrName( QString const & text );
 signals:

src/ui/favoritespanewidget.cc

@@ -274,12 +274,12 @@ void FavoritesPaneWidget::clearAllItems()
 void FavoritesPaneWidget::addHeadword( QString const & path, QString const & headword )
 {
   m_favoritesModel->addNewHeadword( path, headword );
-  GlobalBroadcaster::instance()->folderFavoritesMap[ path ].insert( headword );
+  GlobalBroadcaster::instance()->favoriteWords.insert( headword );
 }
 
 bool FavoritesPaneWidget::removeHeadword( QString const & path, QString const & headword )
 {
-  GlobalBroadcaster::instance()->folderFavoritesMap[ path ].remove( headword );
+  GlobalBroadcaster::instance()->favoriteWords.remove( headword );
 
   return m_favoritesModel->removeHeadword( path, headword );
 }
@@ -761,7 +761,7 @@ void FavoritesModel::addFolder( TreeItem * parent, QDomNode & node )
       }
       parent->appendChild( new TreeItem( word, parent, TreeItem::Word ) );
 
-      GlobalBroadcaster::instance()->folderFavoritesMap[ parent->data().toString() ].insert( word );
+      GlobalBroadcaster::instance()->favoriteWords.insert( word );
     }
   }
   dirty = true;

src/ui/mainwindow.cc

@@ -1646,10 +1646,10 @@ void MainWindow::updateGroupList( bool reload )
     groupInstances.push_back( g );
   }
 
-  GlobalBroadcaster::instance()->groupFolderMap.clear();
+  GlobalBroadcaster::instance()->groupFavoriteMap.clear();
   for ( auto & group : cfg.groups ) {
     groupInstances.push_back( Instances::Group( group, dictionaries, cfg.inactiveDictionaries ) );
-    GlobalBroadcaster::instance()->groupFolderMap.insert( group.id, group.favoritesFolder );
+    GlobalBroadcaster::instance()->groupFavoriteMap.insert( group.id, group.favoritesFolder );
   }
 
   // Update names for dictionaries that are present, so that they could be

src/ui/scanpopup.cc

@@ -1137,7 +1137,7 @@ void ScanPopup::on_sendWordToFavoritesButton_clicked()
     return;
   }
   unsigned groupId   = ui.groupList->getCurrentGroup();
-  auto current_exist = isWordPresentedInFavorites( definition->getTitle(), groupId );
+  auto current_exist = isWordPresentedInFavorites( definition->getTitle() );
   //if current_exist=false( not exist ),  after click ,the word should be in the favorite which is blueStar
   ui.sendWordToFavoritesButton->setIcon( !current_exist ? blueStarIcon : starIcon );
   emit sendWordToFavorites( definition->getTitle(), cfg.lastPopupGroupId, current_exist );
@@ -1223,14 +1223,12 @@ void ScanPopup::titleChanged( ArticleView *, QString const & title ) const
   unsigned groupId = ui.groupList->getCurrentGroup();
 
   // Set icon for "Add to Favorites" button
-  ui.sendWordToFavoritesButton->setIcon( isWordPresentedInFavorites( title, groupId ) ? blueStarIcon : starIcon );
+  ui.sendWordToFavoritesButton->setIcon( isWordPresentedInFavorites( title ) ? blueStarIcon : starIcon );
 }
 
-bool ScanPopup::isWordPresentedInFavorites( QString const & word, unsigned groupId ) const
+bool ScanPopup::isWordPresentedInFavorites( QString const & word )
 {
-  QString folder = GlobalBroadcaster::instance()->groupFolderMap[ groupId ];
-
-  return GlobalBroadcaster::instance()->folderFavoritesMap[ folder ].contains( word );
+  return GlobalBroadcaster::instance()->favoriteWords.contains( word );
 }
 
 #ifdef HAVE_X11

src/ui/scanpopup.hh

@@ -123,7 +123,7 @@ private:
 
   void updateDictionaryBar();
   /// Check is word already presented in Favorites
-  bool isWordPresentedInFavorites( QString const & word, unsigned groupId ) const;
+  static bool isWordPresentedInFavorites( QString const & word );
 
   Config::Class & cfg;
   std::vector< sptr< Dictionary::Class > > const & allDictionaries;