diff --git a/dictionary.hh b/dictionary.hh index 56d2338a..b21933e2 100644 --- a/dictionary.hh +++ b/dictionary.hh @@ -481,6 +481,7 @@ QString generateRandomDictionaryId(); QMap< std::string, sptr< Dictionary::Class > > dictToMap( std::vector< sptr< Dictionary::Class > > const & dicts ); + } #endif diff --git a/groups_widgets.cc b/groups_widgets.cc index 35fd428b..a91190ef 100644 --- a/groups_widgets.cc +++ b/groups_widgets.cc @@ -585,8 +585,7 @@ void DictGroupsWidget::populate( Config::Groups const & groups, { DictGroupWidget *gr = new DictGroupWidget( this, *allDicts, groups[ x ] ); addTab( gr, escapeAmps( groups[ x ].name ) ); - connect( gr, SIGNAL( showDictionaryInfo( QString const & ) ), - this, SIGNAL( showDictionaryInfo( QString const & ) ) ); +// connect( gr, &DictGroupWidget::showDictionaryInfo,this, &DictGroupsWidget::showDictionaryInfo ); connect( gr->getModel(), SIGNAL( contentChanged() ), this, SLOT( tabDataChanged() ) ); setCurrentIndex( x ); diff --git a/mainwindow.cc b/mainwindow.cc index 7dd588ea..7b2dbd18 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -1346,9 +1346,7 @@ void MainWindow::makeDictionaries() loadDictionaries( this, isVisible(), cfg, dictionaries, dictNetMgr, false ); //create map - for(const auto &dict:dictionaries){ - dictMap.insert(dict->getId(),dict); - } + dictMap = Dictionary::dictToMap(dictionaries); for( unsigned x = 0; x < dictionaries.size(); x++ ) {