anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix warning

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6806 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-04-14 19:12:25 +00:00
parent b94ed208a5
commit f96545b498
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2003-04-14 John Levon <levon@movementarian.org>
* QPrefs.C: fix warning
2003-04-12 John Levon <levon@movementarian.org> 2003-04-12 John Levon <levon@movementarian.org>
* ui/QExternalDialogBase.ui: fix tab order * ui/QExternalDialogBase.ui: fix tab order

9
src/frontends/qt2/QPrefs.C
View File

@ -325,8 +325,7 @@ findPos(std::vector<A> const & vec, A const & val)
return std::distance(vec.begin(), it); return std::distance(vec.begin(), it);
} }
void setComboxFont(QComboBox * cb, string const & family, void setComboxFont(QComboBox * cb, string const & family, string const & foundry)
string const & foundry, QFont::StyleHint hint)
{ {
string const name = makeFontName(family, foundry); string const name = makeFontName(family, foundry);
for (int i = 0; i < cb->count(); ++i) { for (int i = 0; i < cb->count(); ++i) {
@ -506,11 +505,11 @@ void QPrefs::update_contents()
QPrefScreenFontsModule * fontmod(dialog_->screenfontsModule); QPrefScreenFontsModule * fontmod(dialog_->screenfontsModule);
setComboxFont(fontmod->screenRomanCO, rc.roman_font_name, setComboxFont(fontmod->screenRomanCO, rc.roman_font_name,
rc.roman_font_foundry, QFont::Serif); rc.roman_font_foundry);
setComboxFont(fontmod->screenSansCO, rc.sans_font_name, setComboxFont(fontmod->screenSansCO, rc.sans_font_name,
rc.sans_font_foundry, QFont::SansSerif); rc.sans_font_foundry);
setComboxFont(fontmod->screenTypewriterCO, rc.typewriter_font_name, setComboxFont(fontmod->screenTypewriterCO, rc.typewriter_font_name,
rc.typewriter_font_foundry, QFont::TypeWriter); rc.typewriter_font_foundry);
dialog_->select_roman(fontmod->screenRomanCO->currentText()); dialog_->select_roman(fontmod->screenRomanCO->currentText());
dialog_->select_sans(fontmod->screenSansCO->currentText()); dialog_->select_sans(fontmod->screenSansCO->currentText());