From: John Levon <levon@movementarian.org>
Date: Mon, 14 Apr 2003 19:12:25 +0000 (+0000)
Subject: fix warning
X-Git-Tag: 1.6.10~16970
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f96545b498a5de0d477d81ea19beca245dd31dad;p=features.git

fix warning


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6806 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f6d0a7f6eb..8064c803fb 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-14  John Levon  <levon@movementarian.org>
+
+	* QPrefs.C: fix warning
+
 2003-04-12  John Levon  <levon@movementarian.org>
 
 	* ui/QExternalDialogBase.ui: fix tab order
diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index 8385b06e9c..ed4c595447 100644
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -325,8 +325,7 @@ findPos(std::vector<A> const & vec, A const & val)
 	return std::distance(vec.begin(), it);
 }
 
-void setComboxFont(QComboBox * cb, string const & family,
-		string const & foundry, QFont::StyleHint hint)
+void setComboxFont(QComboBox * cb, string const & family, string const & foundry)
 {
 	string const name = makeFontName(family, foundry);
 	for (int i = 0; i < cb->count(); ++i) {
@@ -506,11 +505,11 @@ void QPrefs::update_contents()
 	QPrefScreenFontsModule * fontmod(dialog_->screenfontsModule);
 
 	setComboxFont(fontmod->screenRomanCO, rc.roman_font_name,
-			rc.roman_font_foundry, QFont::Serif);
+			rc.roman_font_foundry);
 	setComboxFont(fontmod->screenSansCO, rc.sans_font_name,
-			rc.sans_font_foundry, QFont::SansSerif);
+			rc.sans_font_foundry);
 	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_sans(fontmod->screenSansCO->currentText());