1

This reverts commit 1272ea2d20a7908b9a69d6b551511916f97cc024.

src/audio/README.md

@@ -0,0 +1,3 @@
+Code to support GD's internal/external audio players.
+
+Only `audioplayerinterface.hh` is supposed to be used outside this folder.

src/config.cc

@@ -111,7 +111,7 @@ HotKey::HotKey( QKeySequence const & seq ):
 
 QKeySequence HotKey::toKeySequence() const
 {
-  if ( key2 != 0 || key2 != Qt::Key::Key_unknown ) {
+  if ( key2 != 0 && key2 != Qt::Key::Key_unknown ) {
     return { QKeyCombination( modifiers, static_cast< Qt::Key >( key1 ) ),
              QKeyCombination( modifiers, static_cast< Qt::Key >( key2 ) ) };
   }

src/instances.cc

@@ -53,9 +53,8 @@ Group::Group( Config::Group const & cfgGroup,
   }
 }
 
-Group::Group( QString name_ ):
+Group::Group():
-  id( 0 ),
+  id( 0 )
-  name( std::move( name_ ) )
 {
 }
 

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_ );
 

src/ui/articleview.hh

@@ -10,7 +10,7 @@
 #include <QWebEngineView>
 #include <list>
 #include "article_netmgr.hh"
-#include "audioplayerinterface.hh"
+#include "audio/audioplayerinterface.hh"
 #include "instances.hh"
 #include "groupcombobox.hh"
 #include "globalbroadcaster.hh"

src/ui/editdictionaries.cc

@@ -204,22 +204,11 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups )
   // Those hold pointers to dictionaries, we need to free them.
   groupInstances.clear();
 
-  //  groups.clear();
-  //  orderAndProps.clear();
-
   loadDictionaries( this, cfg, dictionaries, dictNetMgr );
 
   if ( rebuildGroups ) {
-    // ui.tabs->removeTab( 1 );
-    // ui.tabs->removeTab( 1 );
-
     orderAndProps->rebuild( savedOrder, savedInactive, dictionaries );
     groups->rebuild( dictionaries, savedGroups, orderAndProps->getCurrentDictionaryOrder() );
-
-    // ui.tabs->insertTab( 1, orderAndProps, QIcon( ":/icons/book.svg" ), tr( "&Dictionaries" ) );
-    // ui.tabs->insertTab( 2, groups, QIcon( ":/icons/bookcase.svg" ), tr( "&Groups" ) );
-    // connect( groups, &Groups::showDictionaryInfo, this, &EditDictionaries::showDictionaryInfo );
-    // connect( orderAndProps, &OrderAndProps::showDictionaryHeadwords, this, &EditDictionaries::showDictionaryHeadwords );
   }
   setUpdatesEnabled( true );
 }

src/ui/groups.cc

@@ -75,10 +75,7 @@ void Groups::rebuild( vector< sptr< Dictionary::Class > > const & dicts_,
   ui.dictionaries->setAsSource();
   ui.dictionaries->populate( Instances::Group( order, dicts, Config::Group() ).dictionaries, dicts );
 
-  //  ui.searchLine->applyTo( ui.dictionaries );
-
   // Populate groups' widget
-
   ui.groups->populate( groups, dicts, ui.dictionaries->getCurrentDictionaries() );
 
   countChanged();

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;
 

src/ui/mainwindow.hh

@@ -14,7 +14,7 @@
 #include "config.hh"
 #include "dict/dictionary.hh"
 #include "article_netmgr.hh"
-#include "audioplayerfactory.hh"
+#include "audio/audioplayerfactory.hh"
 #include "instances.hh"
 #include "article_maker.hh"
 #include "scanpopup.hh"

src/ui/orderandprops.cc

@@ -146,8 +146,6 @@ void OrderAndProps::rebuild( Config::Group const & dictionaryOrder,
   ui.dictionaryOrder->populate( order.dictionaries, allDictionaries );
   ui.inactiveDictionaries->populate( inactive.dictionaries, allDictionaries );
 
-  //  ui.searchLine->applyTo( ui.dictionaryOrder );
-
   disableDictionaryDescription();
 
   showDictNumbers();
@@ -156,7 +154,7 @@ void OrderAndProps::rebuild( Config::Group const & dictionaryOrder,
 
 Config::Group OrderAndProps::getCurrentDictionaryOrder() const
 {
-  Instances::Group g( "" );
+  Instances::Group g;
 
   g.dictionaries = ui.dictionaryOrder->getCurrentDictionaries();
 
@@ -165,7 +163,7 @@ Config::Group OrderAndProps::getCurrentDictionaryOrder() const
 
 Config::Group OrderAndProps::getCurrentInactiveDictionaries() const
 {
-  Instances::Group g( "" );
+  Instances::Group g;
 
   g.dictionaries = ui.inactiveDictionaries->getCurrentDictionaries();