Synchronize lfun thematical ordering and func_type.

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 5b44466eeb6fb73f096ed328ac3d26a26fa96033..36d850b1d9f867d9bee153852a94d03fb47cf189 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -24,8 +24,8 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "debug.h"
-#include "gettext.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"
@@ -57,21 +57,11 @@
 #include <stack>
 #include <sstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using lyx::support::contains;
-using lyx::support::rsplit;
-using support::subst;
-
-using std::distance;
-using std::endl;
-using std::list;
-using std::stack;
-using std::string;
-using std::ostream;
-using std::ostringstream;
-
 
 ParagraphMetrics::ParagraphMetrics(Paragraph const & par): position_(-1), par_(&par)
 {
@@ -103,8 +93,7 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
        boost::crc_32_type crc;
        for (pos_type i = row.pos(); i < row.endpos(); ++i) {
                char_type const b[] = { par_->getChar(i) };
-               // char_type is 4 bytes!
-               crc.process_bytes(b, 4);
+               crc.process_bytes(b, sizeof(char_type));
                if (bparams.trackChanges) {
                        Change change = par_->lookupChange(i);
                        char_type const b[] = { change.type };