From: Bo Peng <bpeng@lyx.org>
Date: Wed, 25 Apr 2007 17:15:56 +0000 (+0000)
Subject: merge src/frontends/controllers/biblio, character, frnt_lang, helper_funcs and tex_he... 
X-Git-Tag: 1.6.10~10082
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=65d89a8af302a1774558a3292e6fa486e09f571c;p=features.git

merge src/frontends/controllers/biblio, character, frnt_lang, helper_funcs and tex_helpers to frontend_helpers, step 1

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 296598f5fc..fb3ff8ee84 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -585,11 +585,7 @@ src_frontends_controllers_files = Split('''
     ControlWrap.C
     Dialog.C
     Kernel.C
-    biblio.C
-    character.C
-    frnt_lang.C
-    helper_funcs.C
-    tex_helpers.C
+    frontend_helpers.cpp
 ''')
 
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5a52291cf7..fe4e714438 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,11 +30,7 @@ src/frontends/controllers/ControlPrefs.C
 src/frontends/controllers/ControlPrint.C
 src/frontends/controllers/ControlSpellchecker.C
 src/frontends/controllers/ControlToc.C
-src/frontends/controllers/biblio.C
-src/frontends/controllers/character.C
-src/frontends/controllers/frnt_lang.C
-src/frontends/controllers/helper_funcs.C
-src/frontends/controllers/tex_helpers.C
+src/frontends/controllers/frontend_helpers.cpp
 src/frontends/qt4/Alert_pimpl.C
 src/frontends/qt4/BulletsModule.C
 src/frontends/qt4/Dialogs.C
diff --git a/src/factory.C b/src/factory.C
index 318044c750..e9b32604ea 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -402,7 +402,7 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf)
 		// the various \\footcite commands. We should increase the
 		// file format number and read these commands here, too.
 		// Then we should use is_possible_cite_command() in
-		// src/frontends/controllers/biblio.C to test for valid cite
+		// src/frontends/controllers/frontend_helpers.cpp to test for valid cite
 		// commands.
 		if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) {
 			inset.reset(new InsetCitation(inscmd));
diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am
index aecdeaabd8..a6bfd09042 100644
--- a/src/frontends/controllers/Makefile.am
+++ b/src/frontends/controllers/Makefile.am
@@ -15,13 +15,9 @@ libcontrollers_la_SOURCES= \
 	Dialog.h \
 	Kernel.C \
 	Kernel.h \
-	biblio.C \
 	biblio.h \
-	character.C \
 	character.h \
-	frnt_lang.C \
 	frnt_lang.h \
-	tex_helpers.C \
 	tex_helpers.h \
 	BCView.h \
 	BCView.C \
@@ -99,5 +95,5 @@ libcontrollers_la_SOURCES= \
 	ControlVSpace.h \
 	ControlWrap.C \
 	ControlWrap.h \
-	helper_funcs.C \
+	frontend_helpers.cpp \
 	helper_funcs.h
diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index 85bc4c8ca6..ee917f6a94 100644
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -1,5 +1,5 @@
 /**
- * \file biblio.C
+ * \file frontend_helpers.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/controllers/character.C b/src/frontends/controllers/character.C
index d13387cf66..ca5fa6d012 100644
--- a/src/frontends/controllers/character.C
+++ b/src/frontends/controllers/character.C
@@ -1,5 +1,5 @@
 /**
- * \file character.C
+ * \file frontend_helpers.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/controllers/frnt_lang.C b/src/frontends/controllers/frnt_lang.C
index 1c3bee9ad7..ce48d0f8ad 100644
--- a/src/frontends/controllers/frnt_lang.C
+++ b/src/frontends/controllers/frnt_lang.C
@@ -1,5 +1,5 @@
 /**
- * \file frnt_lang.C
+ * \file frontend_helpers.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/controllers/helper_funcs.C b/src/frontends/controllers/helper_funcs.C
index 52806173ae..20006707f1 100644
--- a/src/frontends/controllers/helper_funcs.C
+++ b/src/frontends/controllers/helper_funcs.C
@@ -1,5 +1,5 @@
 /**
- * \file helper_funcs.C
+ * \file frontend_helpers.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/controllers/tests/biblio.C b/src/frontends/controllers/tests/biblio.C
index 3a51499ed6..6fe25a36b3 100644
--- a/src/frontends/controllers/tests/biblio.C
+++ b/src/frontends/controllers/tests/biblio.C
@@ -13,7 +13,7 @@ using std::string;
 // Escape special chars.
 // All characters are literals except: '.|*?+(){}[]^$\'
 // These characters are literals when preceded by a "\", which is done here
-// This function is unfortunately copied from ../biblio.C, so we should
+// This function is unfortunately copied from ../frontend_helpers.cpp, so we should
 // try to make sure to keep the two in sync.
 string const escape_special_chars(string const & expr)
 {
@@ -35,7 +35,7 @@ typedef std::map<string, string> InfoMap;
 
 // A functor for use with std::find_if, used to ascertain whether a
 // data entry matches the required regex_
-// This class is unfortunately copied from ../biblio.C, so we should
+// This class is unfortunately copied from ../frontend_helpers.cpp, so we should
 // try to make sure to keep the two in sync.
 class RegexMatch : public std::unary_function<string, bool>
 {
diff --git a/src/frontends/controllers/tex_helpers.C b/src/frontends/controllers/tex_helpers.C
index e00abbc05b..aba85a1d7a 100644
--- a/src/frontends/controllers/tex_helpers.C
+++ b/src/frontends/controllers/tex_helpers.C
@@ -1,5 +1,5 @@
 /**
- * \file tex_helpers.C
+ * \file frontend_helpers.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index 24f2de9112..d246d62bca 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -68,7 +68,7 @@ InsetCommandParams::findInfo(std::string const & name)
 
 	// InsetCitation
 	// FIXME: Use is_possible_cite_command() in
-	// src/frontends/controllers/biblio.C, see comment in src/factory.C.
+	// src/frontends/controllers/frontend_helpers.cpp, see comment in src/factory.C.
 	if (name == "cite" || name == "citet" || name == "citep" || name == "citealt" ||
 	    name == "citealp" || name == "citeauthor" || name == "citeyear" ||
 	    name == "citeyearpar" || name == "citet*" || name == "citep*" ||