Encodings: Use BufferEncodings where needed

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 394e12d993624c98fbceea67c6fde251c2b90679..948f9cc2fde2c12ed0adfa5ca85fafbf96196a0b 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -28,7 +28,7 @@
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
 #include "DocIterator.h"
-#include "Encoding.h"
+#include "BufferEncodings.h"
 #include "ErrorList.h"
 #include "Exporter.h"
 #include "Format.h"
@@ -1558,7 +1558,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
                d->ignore_parent = true;
 
        // Classify the unicode characters appearing in math insets
-       Encodings::initUnicodeMath(*this);
+       BufferEncodings::initUnicodeMath(*this);
 
        // validate the buffer.
        LYXERR(Debug::LATEX, "  Validating buffer...");

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index b0a41377ca38208edc4b1b0434ac6a9f93dc6e0f..c261b5320bd7405ba6ad49d95632434b4823182d 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -25,7 +25,7 @@
 #include "BufferParams.h"
 #include "Changes.h"
 #include "Counters.h"
-#include "Encoding.h"
+#include "BufferEncodings.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -1528,7 +1528,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
                                break;
                        }
                }
-               Encodings::validate(text_[i], features);
+               BufferEncodings::validate(text_[i], features);
        }
 }
 

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 2e62ffcd6073d8732edcada6e45e50c60fbf68c7..03bda07cf60475c4ebaae4584ea401c613fccc12 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -18,7 +18,7 @@
 #include "MetricsInfo.h"
 
 #include "Dimension.h"
-#include "Encoding.h"
+#include "BufferEncodings.h"
 #include "LaTeXFeatures.h"
 #include "TextPainter.h"
 
@@ -141,7 +141,7 @@ void InsetMathChar::write(WriteStream & os) const
 void InsetMathChar::validate(LaTeXFeatures & features) const
 {
        if (!isASCII(char_))
-               encodings.validate(char_, features, true);
+               BufferEncodings::validate(char_, features, true);
 }