From 5f8f8dd947dcb984c943e9832aeffcb55875a987 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Sat, 17 Oct 2009 22:58:44 +0000
Subject: [PATCH] Factor out some common code.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31655 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiPrefs.cpp | 49 ++++++++++++++++------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 2ca84b17fa..d1ea743751 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1835,24 +1835,33 @@ void PrefFileformats::updatePrettyname()
 }
 
 
+namespace {
+	void updateComboBox(LyXRC::Alternatives const & alts,
+	                    string const & fmt, QComboBox * combo)
+	{
+		LyXRC::Alternatives::const_iterator it = 
+				alts.find(fmt);
+		if (it != alts.end()) {
+			LyXRC::CommandSet const & cmds = it->second;
+			LyXRC::CommandSet::const_iterator sit = 
+					cmds.begin();
+			LyXRC::CommandSet::const_iterator const sen = 
+					cmds.end();
+			for (; sit != sen; ++sit) {
+				QString const qcmd = toqstr(*sit);
+				combo->addItem(qcmd, qcmd);
+			}
+		}
+	}
+}
+
+
 void PrefFileformats::updateViewers()
 {
 	Format const f = currentFormat();
 	viewerCO->clear();
 	viewerCO->addItem(qt_("None"), QString());
-	LyXRC::Alternatives::const_iterator it = 
-			viewer_alternatives.find(f.name());
-	if (it != viewer_alternatives.end()) {
-		LyXRC::CommandSet const & cmds = it->second;
-		LyXRC::CommandSet::const_iterator sit = 
-				cmds.begin();
-		LyXRC::CommandSet::const_iterator const sen = 
-				cmds.end();
-		for (; sit != sen; ++sit) {
-			QString const qcmd = toqstr(*sit);
-			viewerCO->addItem(qcmd, qcmd);
-		}
-	}
+	updateComboBox(viewer_alternatives, f.name(), viewerCO);
 	viewerCO->addItem(qt_("Custom"), QString("custom viewer"));
 
 	int pos = viewerCO->findData(toqstr(f.viewer()));
@@ -1873,19 +1882,7 @@ void PrefFileformats::updateEditors()
 	Format const f = currentFormat();
 	editorCO->clear();
 	editorCO->addItem(qt_("None"), QString());
-	LyXRC::Alternatives::const_iterator it = 
-			editor_alternatives.find(f.name());
-	if (it != editor_alternatives.end()) {
-		LyXRC::CommandSet const & cmds = it->second;
-		LyXRC::CommandSet::const_iterator sit = 
-				cmds.begin();
-		LyXRC::CommandSet::const_iterator const sen = 
-				cmds.end();
-		for (; sit != sen; ++sit) {
-			QString const qcmd = toqstr(*sit);
-			editorCO->addItem(qcmd, qcmd);
-		}
-	}
+	updateComboBox(editor_alternatives, f.name(), editorCO);
 	editorCO->addItem(qt_("Custom"), QString("custom editor"));
 
 	int pos = editorCO->findData(toqstr(f.editor()));
-- 
2.39.2