merge src/frontends/controllers/biblio, character, frnt_lang, helper_funcs and tex_he...

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index fb3ff8ee84c4c197c521ea8f8de2dc6bd835fae8..1cd0f5ede75745380302fce7aff8f969d5d4dd90 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -536,11 +536,7 @@ src_frontends_controllers_header_files = Split('''
     ControlWrap.h
     Dialog.h
     Kernel.h
-    biblio.h
-    character.h
-    frnt_lang.h
-    helper_funcs.h
-    tex_helpers.h
+    frontend_helpers.h
 ''')
 
 

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 8736b111c5d7968fa8c43549a1ef3ce4c7545c97..04e58eb4d95fb8bdd953699c9123a952674f8b8c 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -31,7 +31,7 @@
 #include "support/docstream.h"
 #include "support/filetools.h"
 
-#include "frontends/controllers/biblio.h"
+#include "frontends/controllers/frontend_helpers.h"
 
 namespace lyx {
 

diff --git a/src/bufferparams.h b/src/bufferparams.h
index c87b335737803a63d8de84f53e0d0279d884dfac..23e4ca9f9a92200afcf694f57f2e6d5883aa70b4 100644 (file)
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -23,7 +23,7 @@
 #include "support/copied_ptr.h"
 #include "support/types.h"
 
-#include "frontends/controllers/biblio.h"
+#include "frontends/controllers/frontend_helpers.h"
 
 #include <vector>
 

diff --git a/src/frontends/controllers/ControlBibtex.C b/src/frontends/controllers/ControlBibtex.C
index 6a069ee1e906c394e82360df8769657f29bea35a..3761a3532083d3c4d56b511dd1641f3ea5b22ff1 100644 (file)
--- a/src/frontends/controllers/ControlBibtex.C
+++ b/src/frontends/controllers/ControlBibtex.C
@@ -13,14 +13,12 @@
 #include <config.h>
 
 #include "ControlBibtex.h"
-#include "biblio.h"
+#include "frontend_helpers.h"
 
 #include "buffer.h"
 #include "bufferparams.h"
 
 #include "lyxrc.h"
-#include "helper_funcs.h"
-#include "tex_helpers.h"
 #include "gettext.h"
 
 #include "support/filefilterlist.h"

diff --git a/src/frontends/controllers/ControlCharacter.h b/src/frontends/controllers/ControlCharacter.h
index b940e3aa58124e4c3e2f397e710ec61af155174f..66313459b8bd5c79318400bcd622a399cbb9d57b 100644 (file)
--- a/src/frontends/controllers/ControlCharacter.h
+++ b/src/frontends/controllers/ControlCharacter.h
@@ -14,7 +14,7 @@
 
 
 #include "Dialog.h"
-#include "character.h"
+#include "frontend_helpers.h"
 
 
 namespace lyx {

diff --git a/src/frontends/controllers/ControlCitation.h b/src/frontends/controllers/ControlCitation.h
index cb92b51e4681208461be1839e135a1174a1c3cfb..652094e3c2e48d14cbce26f9331b013dee8d3dc2 100644 (file)
--- a/src/frontends/controllers/ControlCitation.h
+++ b/src/frontends/controllers/ControlCitation.h
@@ -15,7 +15,7 @@
 
 
 #include "ControlCommand.h"
-#include "biblio.h"
+#include "frontend_helpers.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index aaf58008adddbf63cb6effca22c94c07b2895159..a416bc424b738e329b746b37a87e869ee7f82b41 100644 (file)
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -16,7 +16,7 @@
 
 #include "funcrequest.h"
 #include "gettext.h"
-#include "helper_funcs.h"
+#include "frontend_helpers.h"
 #include "lyxrc.h"
 
 #include "graphics/GraphicsCache.h"

diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index 4bf31915696cb634750d409a1aa7e573bbc35771..d835ab69e02d996c138ea749bf6ad9605b9e09d1 100644 (file)
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -13,7 +13,7 @@
 
 #include "ControlGraphics.h"
 
-#include "helper_funcs.h"
+#include "frontend_helpers.h"
 
 #include "funcrequest.h"
 #include "gettext.h"

diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C
index 09784758e27fff98239552462440d6e2e4baaada..e1d24c435f67662711a43a96373d7acffda42c37 100644 (file)
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -13,7 +13,7 @@
 #include <config.h>
 
 #include "ControlInclude.h"
-#include "helper_funcs.h"
+#include "frontend_helpers.h"
 #include "Kernel.h"
 
 #include "buffer.h"

diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C
index 86950c9b8e86864ce34898a67be350ff6bfb8d64..7f2d4e1983136b223874c81652a42cc62525c922 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -12,7 +12,7 @@
 
 #include "ControlPrefs.h"
 
-#include "helper_funcs.h"
+#include "frontend_helpers.h"
 #include "Kernel.h"
 
 #include "bufferlist.h"

diff --git a/src/frontends/controllers/ControlPrint.C b/src/frontends/controllers/ControlPrint.C
index 292997e18fdedeb55e376b8d341936804ac08de4..84064d5ac395c4cef2974afe93d61513f3bfecd6 100644 (file)
--- a/src/frontends/controllers/ControlPrint.C
+++ b/src/frontends/controllers/ControlPrint.C
@@ -13,7 +13,7 @@
 #include "ControlPrint.h"
 
 #include "ButtonController.h"
-#include "helper_funcs.h"
+#include "frontend_helpers.h"
 
 #include "buffer.h"
 #include "bufferparams.h"

diff --git a/src/frontends/controllers/ControlTexinfo.h b/src/frontends/controllers/ControlTexinfo.h
index 0b000e197a9ea3f84db15e767e884edae59454c1..7bb40282e42b6bad9a34942ac439093052dbfe59 100644 (file)
--- a/src/frontends/controllers/ControlTexinfo.h
+++ b/src/frontends/controllers/ControlTexinfo.h
@@ -14,7 +14,7 @@
 
 
 #include "Dialog.h"
-#include "tex_helpers.h"
+#include "frontend_helpers.h"
 
 namespace lyx {
 namespace frontend {

diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am
index a6bfd0904211e90664fc12d0d5951e28afc99211..69cf115005682c96af11ea8d56fe6202f3267371 100644 (file)
--- a/src/frontends/controllers/Makefile.am
+++ b/src/frontends/controllers/Makefile.am
@@ -15,10 +15,6 @@ libcontrollers_la_SOURCES= \
        Dialog.h \
        Kernel.C \
        Kernel.h \
-       biblio.h \
-       character.h \
-       frnt_lang.h \
-       tex_helpers.h \
        BCView.h \
        BCView.C \
        ButtonController.C \
@@ -96,4 +92,4 @@ libcontrollers_la_SOURCES= \
        ControlWrap.C \
        ControlWrap.h \
        frontend_helpers.cpp \
-       helper_funcs.h
+       frontend_helpers.h

diff --git a/src/frontends/controllers/frontend_helpers.cpp b/src/frontends/controllers/frontend_helpers.cpp
index 434290ed6879b83ff463d49a38965a2284e937cc..382dcc4e033c2c14fa235a663eb16169bd62e88a 100644 (file)
--- a/src/frontends/controllers/frontend_helpers.cpp
+++ b/src/frontends/controllers/frontend_helpers.cpp
@@ -11,21 +11,41 @@
 
 #include <config.h>
 
-#include "biblio.h"
+#include "frontend_helpers.h"
 
 #include "buffer.h"
 #include "bufferparams.h"
+#include "debug.h"
 #include "gettext.h"
-
-#include "support/lstrings.h"
+#include "language.h"
+#include "lyxlength.h"
 
 #include <boost/regex.hpp>
 
 #include <algorithm>
+#include <config.h>
+
+#include "LColor.h"
+
+#include "frontends/FileDialog.h"
+#include "frontends/Alert.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/package.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/lyxalgo.h"
+#include "support/os.h"
+#include "support/package.h"
+#include "support/path.h"
+#include "support/systemcall.h"
 
+#include <boost/cregex.hpp>
+#include <fstream>
 using std::string;
 using std::vector;
-
+using std::pair;
+using std::endl;
 
 namespace lyx {
 
@@ -834,27 +854,7 @@ getAuthorYearStrings(string const & key,
 }
 
 } // namespace biblio
-} // namespace lyx
-/**
- * \file frontend_helpers.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
 
-#include "gettext.h"
-#include "character.h"
-#include "LColor.h"
-
-using std::vector;
-
-namespace lyx {
 namespace frontend {
 
 vector<FamilyPair> const getFamilyData()
@@ -1096,34 +1096,7 @@ vector<ColorPair> const getColorData()
        return color;
 }
 
-} // namespace frontend
-} // namespace lyx
-/**
- * \file frontend_helpers.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
 
-#include "frnt_lang.h"
-#include "gettext.h"
-#include "language.h"
-
-#include <algorithm>
-
-
-using std::string;
-using std::vector;
-
-
-namespace lyx {
-namespace frontend {
 
 namespace {
 
@@ -1173,37 +1146,6 @@ vector<LanguagePair> const getLanguageData(bool character_dlg)
 }
 
 } // namespace frontend
-} // namespace lyx
-/**
- * \file frontend_helpers.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Jean-Marc Lasgouttes
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-
-#include <config.h>
-
-#include "helper_funcs.h"
-
-#include "gettext.h"
-#include "lyxlength.h"
-
-#include "frontends/FileDialog.h"
-
-#include "support/filetools.h"
-#include "support/lstrings.h"
-#include "support/package.h"
-
-using std::pair;
-using std::string;
-using std::vector;
-
-namespace lyx {
 
 using support::addName;
 using support::FileFilterList;
@@ -1331,41 +1273,7 @@ vector<docstring> const getLatexUnits()
 }
 
 } // namespace frontend
-} // namespace lyx
-/**
- * \file frontend_helpers.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Herbert Voß
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "tex_helpers.h"
 
-#include "debug.h"
-#include "gettext.h"
-
-#include "frontends/Alert.h"
-
-#include "support/filetools.h"
-#include "support/lstrings.h"
-#include "support/lyxalgo.h"
-#include "support/os.h"
-#include "support/package.h"
-#include "support/path.h"
-#include "support/systemcall.h"
-
-#include <boost/cregex.hpp>
-#include <fstream>
-
-using std::string;
-using std::endl;
-
-namespace lyx {
 
 using support::bformat;
 using support::contains;

diff --git a/src/frontends/controllers/frontend_helpers.h b/src/frontends/controllers/frontend_helpers.h
index 96bed3f5546e14ee6d56800f60e7679458d24b15..34375bfbf36ff09e67b122840ab5c595bc5f7903 100644 (file)
--- a/src/frontends/controllers/frontend_helpers.h
+++ b/src/frontends/controllers/frontend_helpers.h
@@ -1,21 +1,28 @@
 // -*- C++ -*-
 /**
- * \file biblio.h
+ * \file frontend_helpers.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Angus Leeming
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef BIBLIOHELPERS_H
-#define BIBLIOHELPERS_H
+#ifndef FRONTEND_HELPERS_H
+#define FRONTEND_HELPERS_H
 
+#include "lyxfont.h"
 #include "support/docstring.h"
 
-#include <map>
+#include <utility>
 #include <vector>
+#include <string>
+#include <boost/bind.hpp>
+#include <algorithm>
+#include <utility>
+#include <map>
 
 class Buffer;
 
@@ -166,27 +173,6 @@ getAuthorYearStrings(std::string const & key,
 } // namespace biblio
 } // namespace lyx
 
-#endif // BIBLIOHELPERS_H
-// -*- C++ -*-
-/**
- * \file character.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef CHARACTERHELPERS_H
-#define CHARACTERHELPERS_H
-
-
-#include "lyxfont.h"
-
-#include <utility>
-#include <vector>
-
 
 class LColor_color;
 
@@ -235,33 +221,6 @@ std::vector<BarPair>      const getBarData();
 ///
 std::vector<ColorPair>    const getColorData();
 
-} // namespace frontend
-} // namespace lyx
-
-#endif // CHARACTERHELPERS
-// -*- C++ -*-
-/**
- * \file frnt_lang.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- *
- * Ease the use of internationalised language strings in the dialogs.
- */
-
-#ifndef FRNT_LANG_H
-#define FRNT_LANG_H
-
-#include "support/docstring.h"
-
-#include <utility>
-#include <vector>
-
-namespace lyx {
-namespace frontend {
 
 ///
 typedef std::pair<docstring, std::string> LanguagePair;
@@ -272,34 +231,8 @@ typedef std::pair<docstring, std::string> LanguagePair;
 std::vector<LanguagePair> const getLanguageData(bool character_dlg);
 
 } // namespace frontend
-} // namespace lyx
-
-#endif // FRNT_LANG_H
-// -*- C++ -*-
-/**
- * \file helper_funcs.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef HELPERFUNCS_H
-#define HELPERFUNCS_H
-
-#include "support/docstring.h"
-
-#include <boost/bind.hpp>
-#include <utility>
-#include <vector>
-#include <string>
-#include <algorithm>
 
 
-namespace lyx {
-
 namespace support { class FileFilterList; }
 
 
@@ -394,30 +327,6 @@ getSecond(std::vector<Pair> const & pr)
        return tmp;
 }
 
-} // namespace frontend
-} // namespace lyx
-
-#endif // NOT HELPERFUNCS_H
-// -*- C++ -*-
-/**
- * \file tex_helpers.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Herbert Voß
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef TEX_HELPERS_H
-#define TEX_HELPERS_H
-
-#include <string>
-#include <vector>
-
-namespace lyx {
-namespace frontend {
-
 /** Build filelists of all availabe bst/cls/sty-files. Done through
  *  kpsewhich and an external script, saved in *Files.lst.
  */
@@ -440,4 +349,4 @@ std::string const getTexFileFromList(std::string const & classname, std::string
 } // namespace frontend
 } // namespace lyx
 
-#endif // TEX_HELPERS_H
+#endif // FRONTEND_HELPERS_H

diff --git a/src/frontends/qt4/QBox.C b/src/frontends/qt4/QBox.C
index 675554c637f11cfc92c831905612db8ddd21495e..29db7d07d4f14f33c7fc6307686051e53859f9d9 100644 (file)
--- a/src/frontends/qt4/QBox.C
+++ b/src/frontends/qt4/QBox.C
@@ -23,7 +23,7 @@
 #include "validators.h"
 
 #include "controllers/ControlBox.h"
-#include "controllers/helper_funcs.h"
+#include "controllers/frontend_helpers.h"
 
 #include "insets/InsetBox.h"
 

diff --git a/src/frontends/qt4/QCharacter.h b/src/frontends/qt4/QCharacter.h
index b9fb020c268ceb95430f9f6672ed67d9eba33550..76369af137adf596fd7f7400973ff79688823974 100644 (file)
--- a/src/frontends/qt4/QCharacter.h
+++ b/src/frontends/qt4/QCharacter.h
@@ -17,8 +17,7 @@
 #include "ui/CharacterUi.h"
 #include <QDialog>
 
-#include "controllers/character.h"
-#include "controllers/frnt_lang.h"
+#include "controllers/frontend_helpers.h"
 
 #include <vector>
 

diff --git a/src/frontends/qt4/QCitationDialog.C b/src/frontends/qt4/QCitationDialog.C
index b63cada9a2dfd92ddfaedaf31bfdb189d65bcfd1..b0ccf8e038c8d2692065056154d9bc07ba53a98b 100644 (file)
--- a/src/frontends/qt4/QCitationDialog.C
+++ b/src/frontends/qt4/QCitationDialog.C
@@ -17,7 +17,7 @@
 
 #include "QCitation.h"
 
-#include "frontends/controllers/biblio.h"
+#include "frontends/controllers/frontend_helpers.h"
 #include "frontends/controllers/ControlCitation.h"
 
 #include "debug.h"

diff --git a/src/frontends/qt4/QDocument.C b/src/frontends/qt4/QDocument.C
index 39a17026651280de3ff976b6f106e91021bcbba1..a61c6952212c685681e373183a54a3ba45e8402b 100644 (file)
--- a/src/frontends/qt4/QDocument.C
+++ b/src/frontends/qt4/QDocument.C
@@ -23,7 +23,6 @@
 #include "panelstack.h"
 #include "Qt2BC.h"
 #include "checkedwidgets.h"
-#include "qt_helpers.h"
 
 // For latexHighlighter use in the preamble.
 #include "QViewSource.h"
@@ -31,21 +30,18 @@
 #include "bufferparams.h"
 #include "encoding.h"
 #include "gettext.h"
-#include "helper_funcs.h" // getSecond()
+#include "frontend_helpers.h" // getSecond()
 #include "language.h"
 #include "lyxrc.h" // defaultUnit
 #include "lyxtextclasslist.h"
 #include "tex-strings.h" // tex_graphics
 #include "Spacing.h"
 
-#include "frontends/controllers/biblio.h"
 #include "controllers/ControlDocument.h"
-#include "controllers/frnt_lang.h"
 
 #include "support/lstrings.h"
 
 #include "controllers/ControlDocument.h"
-#include "controllers/frnt_lang.h"
 
 
 using lyx::support::token;

diff --git a/src/frontends/qt4/QGraphics.C b/src/frontends/qt4/QGraphics.C
index da4b51c361a067bc200637f38d8db9ef44f27068..2d556279679fc66e7547f303437b30d47d635333 100644 (file)
--- a/src/frontends/qt4/QGraphics.C
+++ b/src/frontends/qt4/QGraphics.C
@@ -26,7 +26,7 @@
 #include "lyxrc.h"
 
 #include "controllers/ControlGraphics.h"
-#include "controllers/helper_funcs.h"
+#include "controllers/frontend_helpers.h"
 
 #include "insets/InsetGraphicsParams.h"
 

diff --git a/src/frontends/qt4/QParagraph.C b/src/frontends/qt4/QParagraph.C
index dd78aaa52916e367ffaaea3c94be88756742cd44..1b5eae27c0207864830a0fb3083556dbb6c0f666 100644 (file)
--- a/src/frontends/qt4/QParagraph.C
+++ b/src/frontends/qt4/QParagraph.C
@@ -21,7 +21,7 @@
 #include "layout.h"
 
 #include "controllers/ControlParagraph.h"
-#include "controllers/helper_funcs.h"
+#include "controllers/frontend_helpers.h"
 
 #include <QCheckBox>
 #include <QLineEdit>

diff --git a/src/frontends/qt4/QPrefs.C b/src/frontends/qt4/QPrefs.C
index a822f75ce4570ecfa0ee3ac87d49279f2bccdb32..07f66d55c2ea2bbebeea2c85b311c6c494be4f16 100644 (file)
--- a/src/frontends/qt4/QPrefs.C
+++ b/src/frontends/qt4/QPrefs.C
@@ -28,8 +28,7 @@
 #include "support/os.h"
 
 #include "controllers/ControlPrefs.h"
-#include "controllers/frnt_lang.h"
-#include "controllers/helper_funcs.h"
+#include "controllers/frontend_helpers.h"
 
 #include "frontends/Alert.h"
 #include "frontends/Application.h"
@@ -76,7 +75,7 @@ string const LanguageSettings = N_("Language settings");
 string const Outputs = N_("Outputs");
 
 
-// FIXME: move to helper_funcs.h
+// FIXME: move to frontend_helpers.h
 
 template<class A>
 static size_t findPos_helper(std::vector<A> const & vec, A const & val)

diff --git a/src/frontends/qt4/QVSpace.C b/src/frontends/qt4/QVSpace.C
index 4d9ca14d14e661ad90a9bf0e8b5f0dfb4b81b90c..ed2516ca4a300ecbcfb2ee92dfc3d194f6355bd0 100644 (file)
--- a/src/frontends/qt4/QVSpace.C
+++ b/src/frontends/qt4/QVSpace.C
@@ -28,7 +28,7 @@
 #include "vspace.h"
 
 #include "controllers/ControlVSpace.h"
-#include "controllers/helper_funcs.h"
+#include "controllers/frontend_helpers.h"
 
 #include "support/lstrings.h"
 

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index e7f3fc86fdef28171580a54226bc0aa496cab3b2..c236ae4a4641c5706021221f6f6ce944905389b2 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -20,7 +20,7 @@
 #include "funcrequest.h"
 #include "LaTeXFeatures.h"
 
-#include "frontends/controllers/biblio.h"
+#include "frontends/controllers/frontend_helpers.h"
 
 #include "support/fs_extras.h"
 #include "support/lstrings.h"

diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h
index f0fd1d7a732cf44b37918f8adcdedbc571c8a271..5b6a24964e2004b1c6a214f57611ad2dd77b2bf2 100644 (file)
--- a/src/insets/InsetCitation.h
+++ b/src/insets/InsetCitation.h
@@ -16,7 +16,7 @@
 
 #include "InsetCommand.h"
 
-#include "frontends/controllers/biblio.h"
+#include "frontends/controllers/frontend_helpers.h"
 
 
 namespace lyx {