rename LColor into Color

[features.git] / src / frontends / controllers / frontend_helpers.h

diff --git a/src/frontends/controllers/frontend_helpers.h b/src/frontends/controllers/frontend_helpers.h
index 96bed3f5546e14ee6d56800f60e7679458d24b15..886061f8ee38048c92ab8cd2575b7c18de3991c2 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,29 +173,8 @@ 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;
+class Color_color;
 
 
 /** Functions of use to the character GUI controller and view */
@@ -220,7 +206,7 @@ typedef std::pair<docstring, LyXFont::FONT_SIZE>   SizePair;
 ///
 typedef std::pair<docstring, FONT_STATE> BarPair;
 ///
-typedef std::pair<docstring, LColor_color> ColorPair;
+typedef std::pair<docstring, Color_color> ColorPair;
 
 ///
 std::vector<FamilyPair>   const getFamilyData();
@@ -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