Remove unused symbol encoding

	* src/encoding.[Ch]
	(symbol_encoding, symbol_encoding_): remove (unused)

	* src/frontends/qt4/QLPainter.C
	(QLPainter::text): Remove commented code. It was used in pre
	unicode times to get unicode values of the symbol fonts if
	USE_UNICODE_FOR_SYMBOLS was defined, but this was never defined
	anyway, since the code points of the symbol fonts (as written in
	lib/symbols) are directly used.

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

diff --git a/src/encoding.C b/src/encoding.C
index abb0b1d6578fe6e83e6cc142a338803bc8bd8e5b..982d4d2c386d33550da957d07c5f08d949a5bd21 100644 (file)
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -265,7 +265,6 @@ Encoding const * Encodings::getFromLaTeXName(string const & name) const
 
 Encodings::Encodings()
 {
-       symbol_encoding_ = Encoding("symbol", "", "");
 }
 
 void Encodings::read(string const & filename)

diff --git a/src/encoding.h b/src/encoding.h
index 6e8bffc387502ef7a2dda22cf3316edcb9c45b74..cce42157aa27003685985de4d6c0c1f354cd1f0a 100644 (file)
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -46,8 +46,6 @@ private:
        std::string iconvName_;
 };
 
-extern Encoding symbol_encoding;
-
 class Encodings {
 public:
        ///
@@ -60,8 +58,6 @@ public:
        Encoding const * getFromLyXName(std::string const & name) const;
        /// Get encoding from LaTeX name \p name
        Encoding const * getFromLaTeXName(std::string const & name) const;
-       ///
-       Encoding const * symbol_encoding() { return &symbol_encoding_; }
 
        ///
        enum Letter_Form {
@@ -88,8 +84,6 @@ public:
 private:
        ///
        EncodingList encodinglist;
-       ///
-       Encoding symbol_encoding_;
 };
 
 extern Encodings encodings;

diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C
index 44379466d6ba5fe0a6fe86215205f6c0feb094dd..4ac6a84c7065e6a88ed0c4bf6c939966665b86e9 100644 (file)
--- a/src/frontends/qt4/QLPainter.C
+++ b/src/frontends/qt4/QLPainter.C
@@ -211,12 +211,6 @@ int QLPainter::smallCapsText(int x, int y,
 int QLPainter::text(int x, int y, char_type const * s, size_t ls,
        LyXFont const & f)
 {
-#if 0
-       Encoding const * encoding = f.language()->encoding();
-       if (f.isSymbolFont())
-               encoding = encodings.symbol_encoding();
-#endif
-
        QString str;
        ucs4_to_qstring(s, ls, str);