diff --git a/config.cc b/config.cc index fc429c07..0b2b7442 100644 --- a/config.cc +++ b/config.cc @@ -309,7 +309,7 @@ Class load() throw( exError ) c.paths.push_back( Path( "/usr/share/dictd", true ) ); if ( QDir( "/usr/share/WyabdcRealPeopleTTS" ).exists() ) - c.soundDirs.push_back( SoundDir( "/usr/share/WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS", "" ) ); + c.soundDirs.push_back( SoundDir( "/usr/share/WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) ); if ( QDir( "/usr/share/myspell/dicts" ).exists() ) c.hunspell.dictionariesPath = "/usr/share/myspell/dicts"; @@ -329,10 +329,10 @@ Class load() throw( exError ) c.paths.push_back( Path( pathToProgramFiles + "\\StarDict\\dic", true ) ); if ( QDir( pathToProgramFiles + "\\StarDict\\WyabdcRealPeopleTTS" ).exists() ) - c.soundDirs.push_back( SoundDir( pathToProgramFiles + "\\StarDict\\WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS", "" ) ); + c.soundDirs.push_back( SoundDir( pathToProgramFiles + "\\StarDict\\WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) ); else if ( QDir( pathToProgramFiles + "\\WyabdcRealPeopleTTS" ).exists() ) - c.soundDirs.push_back( SoundDir( pathToProgramFiles + "\\WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS", "" ) ); + c.soundDirs.push_back( SoundDir( pathToProgramFiles + "\\WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) ); // #### "C:/Program Files" is bad! will not work for German Windows etc. // #### should be replaced to system path @@ -341,10 +341,10 @@ Class load() throw( exError ) // c.paths.push_back( Path( "C:/Program Files/StarDict/dic", true ) ); // // if ( QDir( "C:/Program Files/StarDict/WyabdcRealPeopleTTS" ).exists() ) -// c.soundDirs.push_back( SoundDir( "C:/Program Files/StarDict/WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS", "" ) ); +// c.soundDirs.push_back( SoundDir( "C:/Program Files/StarDict/WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) ); // else // if ( QDir( "C:/Program Files/WyabdcRealPeopleTTS" ).exists() ) -// c.soundDirs.push_back( SoundDir( "C:/Program Files/WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS", "" ) ); +// c.soundDirs.push_back( SoundDir( "C:/Program Files/WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) ); #endif diff --git a/config.hh b/config.hh index 4f1be629..21baeb6b 100644 --- a/config.hh +++ b/config.hh @@ -50,7 +50,7 @@ struct SoundDir SoundDir() {} - SoundDir( QString const & path_, QString const & name_, QString iconFilename_ ): + SoundDir( QString const & path_, QString const & name_, QString iconFilename_ = "" ): path( path_ ), name( name_ ), iconFilename( iconFilename_ ) {} diff --git a/sources.cc b/sources.cc index 46b30760..fe21788b 100644 --- a/sources.cc +++ b/sources.cc @@ -951,7 +951,7 @@ void SoundDirsModel::removeSoundDir( int index ) void SoundDirsModel::addNewSoundDir( QString const & path, QString const & name ) { beginInsertRows( QModelIndex(), soundDirs.size(), soundDirs.size() ); - soundDirs.push_back( Config::SoundDir( path, name, "" ) ); + soundDirs.push_back( Config::SoundDir( path, name ) ); endInsertRows(); }